diff --git a/src/PowerGraphics.jl b/src/PowerGraphics.jl
index d7082dc..8f082f5 100644
--- a/src/PowerGraphics.jl
+++ b/src/PowerGraphics.jl
@@ -26,14 +26,10 @@ import DataFrames
 import YAML
 Reexport.@reexport using Plots
 import DataStructures: OrderedDict, SortedDict
-import PowerSystems
-import InfrastructureSystems
+import PowerSystems as PSY
+import InfrastructureSystems as IS
 import InteractiveUtils
-import PowerAnalytics
-
-const PSY = PowerSystems
-const IS = InfrastructureSystems
-const PA = PowerAnalytics
+import PowerAnalytics as PA
 
 include("definitions.jl")
 include("plot_recipes.jl")
diff --git a/test/runtests.jl b/test/runtests.jl
index 36641b6..e90baec 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -4,7 +4,7 @@ using Logging
 using Dates
 using DataFrames
 using DataStructures
-import InfrastructureSystems
+import InfrastructureSystems as IS
 import InfrastructureSystems: Deterministic, Probabilistic, Scenarios, Forecast
 using PowerSystems
 using PowerGraphics
@@ -18,7 +18,6 @@ using TimeSeries
 using HydroPowerSimulations
 
 const PG = PowerGraphics
-const IS = InfrastructureSystems
 const PSY = PowerSystems
 const PSI = PowerSimulations
 const PA = PowerAnalytics
@@ -32,8 +31,7 @@ const TEST_RESULT_DIR = joinpath(TEST_OUTPUTS, "results")
 !isdir(TEST_RESULT_DIR) && mkdir(TEST_RESULT_DIR)
 const TEST_SIM_NAME = "results_sim"
 
-import PowerSystemCaseBuilder
-const PSB = PowerSystemCaseBuilder
+import PowerSystemCaseBuilder as PSB
 template_dir = joinpath(BASE_DIR, "report_templates")
 const generic_template = joinpath(template_dir, "generic_report_template.jmd")