diff --git a/src/create-model.jl b/src/create-model.jl
index e9febf6c..5ae70ce7 100644
--- a/src/create-model.jl
+++ b/src/create-model.jl
@@ -39,7 +39,7 @@ function create_model!(energy_problem; kwargs...)
 end
 
 """
-    model = create_model(graph, representative_periods, dataframes, timeframe, groups; write_lp_file = false)
+    model = create_model(graph, representative_periods, dataframes, timeframe, groups; write_lp_file = false, enable_names = true)
 
 Create the energy model given the `graph`, `representative_periods`, dictionary of `dataframes` (created by [`construct_dataframes`](@ref)), timeframe, and groups.
 """
@@ -54,6 +54,7 @@ function create_model(
     groups,
     model_parameters;
     write_lp_file = false,
+    enable_names = true,
 )
     # Maximum timestep
     Tmax = maximum(last(rp.timesteps) for year in sets.Y for rp in representative_periods[year])
@@ -68,6 +69,8 @@ function create_model(
     ## Model
     model = JuMP.Model()
 
+    JuMP.set_string_names_on_creation(model, enable_names)
+
     ## Variables
     @timeit to "add_flow_variables!" add_flow_variables!(model, variables)
     @timeit to "add_investment_variables!" add_investment_variables!(model, graph, sets, variables)