diff --git a/config/ci_configs/slabplanet_atmos_diags.yml b/config/ci_configs/slabplanet_atmos_diags.yml
index d43a77b052..ecb0efbfac 100644
--- a/config/ci_configs/slabplanet_atmos_diags.yml
+++ b/config/ci_configs/slabplanet_atmos_diags.yml
@@ -1,5 +1,5 @@
 apply_limiter: false
-ci_plots: true
+plot_diagnostics: true
 dt: "200secs"
 dt_cpl: "200secs"
 dt_save_to_sol: "9days"
diff --git a/experiments/ClimaEarth/cli_options.jl b/experiments/ClimaEarth/cli_options.jl
index 87556b5928..a6c329ef18 100644
--- a/experiments/ClimaEarth/cli_options.jl
+++ b/experiments/ClimaEarth/cli_options.jl
@@ -122,8 +122,8 @@ function argparse_settings()
         help = "Directory to save output files. Note that TempestRemap fails if interactive and paths are too long. [\"experiments/ClimaEarth/output\" (default)]"
         arg_type = String
         default = "experiments/ClimaEarth/output"
-        "--ci_plots"
-        help = "Boolean flag indicating whether to make CI plots [`false` (default), `true`]"
+        "--plot_diagnostics"
+        help = "Boolean flag indicating whether to make plot diagnostics [`false` (default), `true`]"
         arg_type = Bool
         default = false
         # ClimaAtmos specific
diff --git a/experiments/ClimaEarth/run_amip.jl b/experiments/ClimaEarth/run_amip.jl
index ad2a014d46..6f43872344 100644
--- a/experiments/ClimaEarth/run_amip.jl
+++ b/experiments/ClimaEarth/run_amip.jl
@@ -123,7 +123,7 @@ add_extra_diagnostics!(config_dict)
     energy_check,
     conservation_softfail,
     output_dir_root,
-    generate_ci_plots,
+    plot_diagnostics,
 ) = get_coupler_args!(config_dict)
 
 ## get component model dictionaries (if applicable)
@@ -851,7 +851,7 @@ if ClimaComms.iamroot(comms_ctx)
             @info "AMIP plots"
 
             ## ClimaESM
-            include("user_io/ci_plots.jl")
+            include("user_io/diagnostics_plots.jl")
 
             # define variable names and output directories for each diagnostic
             amip_short_names_atmos = ["ta", "ua", "hus", "clw", "pr", "ts", "toa_fluxes_net"]
@@ -860,13 +860,13 @@ if ClimaComms.iamroot(comms_ctx)
             output_dir_coupler = dir_paths.output
 
             # Check if all output variables are available in the specified directories
-            make_ci_plots(
+            make_diagnostics_plots(
                 output_dir_atmos,
                 dir_paths.artifacts,
                 short_names = amip_short_names_atmos,
                 output_prefix = "atmos_",
             )
-            make_ci_plots(
+            make_diagnostics_plots(
                 output_dir_coupler,
                 dir_paths.artifacts,
                 short_names = amip_short_names_coupler,
@@ -883,10 +883,10 @@ if ClimaComms.iamroot(comms_ctx)
         end
     end
     ## plot extra atmosphere diagnostics if specified
-    if generate_ci_plots
-        @info "Generating CI plots"
-        include("user_io/ci_plots.jl")
-        make_ci_plots(atmos_sim.integrator.p.output_dir, dir_paths.artifacts)
+    if plot_diagnostics
+        @info "Plotting diagnostics"
+        include("user_io/diagnostics_plots.jl")
+        make_diagnostics_plots(atmos_sim.integrator.p.output_dir, dir_paths.artifacts)
     end
 
     ## plot all model states and coupler fields (useful for debugging)
diff --git a/experiments/ClimaEarth/user_io/arg_parsing.jl b/experiments/ClimaEarth/user_io/arg_parsing.jl
index 33e052068e..a4d21cb209 100644
--- a/experiments/ClimaEarth/user_io/arg_parsing.jl
+++ b/experiments/ClimaEarth/user_io/arg_parsing.jl
@@ -85,7 +85,7 @@ function get_coupler_args!(config_dict::Dict)
 
     # Output information
     output_dir_root = config_dict["coupler_output_dir"]
-    generate_ci_plots = config_dict["ci_plots"]
+    plot_diagnostics = config_dict["plot_diagnostics"]
 
     # ClimaLand-specific information
     land_domain_type = config_dict["land_domain_type"]
@@ -117,7 +117,7 @@ function get_coupler_args!(config_dict::Dict)
         energy_check,
         conservation_softfail,
         output_dir_root,
-        generate_ci_plots,
+        plot_diagnostics,
         land_domain_type,
         land_albedo_type,
         land_temperature_anomaly,
diff --git a/experiments/ClimaEarth/user_io/ci_plots.jl b/experiments/ClimaEarth/user_io/diagnostics_plots.jl
similarity index 96%
rename from experiments/ClimaEarth/user_io/ci_plots.jl
rename to experiments/ClimaEarth/user_io/diagnostics_plots.jl
index 944c49f28a..e0b2ba355b 100644
--- a/experiments/ClimaEarth/user_io/ci_plots.jl
+++ b/experiments/ClimaEarth/user_io/diagnostics_plots.jl
@@ -144,19 +144,19 @@ function map_comparison(func, simdirs, args)
 end
 
 """
-    make_ci_plots(
+    make_diagnostics_plots(
         output_path::AbstractString,
         plot_path::AbstractString;
         short_names::Vector{<:AbstractString} = ["mse", "lr", "edt", "ts"],
         reduction::String = "average",
         output_prefix = "",
     )
-Create plots for the general CI diagnostics. The plots are saved to `plot_path`.
-This is the default plotting function for the CI diagnostics and it can be extended
+Create plots for diagnostics. The plots are saved to `plot_path`.
+This is the default plotting function for diagnostics and it can be extended
 to include additional diagnostics.
 The `reduction` keyword argument should be consistent with the reduction used to save the diagnostics.
 """
-function make_ci_plots(
+function make_diagnostics_plots(
     output_path::AbstractString,
     plot_path::AbstractString;
     short_names::Vector{<:AbstractString} = ["mse", "lr", "edt", "ts"],