diff --git a/src/vcpkg.cpp b/src/vcpkg.cpp
index 21c0e545f6..df5481fafc 100644
--- a/src/vcpkg.cpp
+++ b/src/vcpkg.cpp
@@ -44,8 +44,7 @@ static void invalid_command(const std::string& cmd)
 static void inner(vcpkg::Filesystem& fs, const VcpkgCmdArguments& args)
 {
     // track version on each invocation
-    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::VcpkgVersion,
-                                                     Commands::Version::version.to_string());
+    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::VcpkgVersion, Commands::Version::version.to_string());
 
     if (args.command.empty())
     {
@@ -68,12 +67,11 @@ static void inner(vcpkg::Filesystem& fs, const VcpkgCmdArguments& args)
         }
     };
 
-    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::BoolMetric::OptionOverlayPorts,
-                                                     !args.overlay_ports.empty());
+    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::OptionOverlayPorts, !args.overlay_ports.empty());
 
     if (const auto command_function = find_command(Commands::get_available_basic_commands()))
     {
-        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::CommandName, command_function->name);
+        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::CommandName, command_function->name);
         return command_function->function->perform_and_exit(args, fs);
     }
 
@@ -84,7 +82,7 @@ static void inner(vcpkg::Filesystem& fs, const VcpkgCmdArguments& args)
 
     if (const auto command_function = find_command(Commands::get_available_paths_commands()))
     {
-        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::CommandName, command_function->name);
+        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::CommandName, command_function->name);
         return command_function->function->perform_and_exit(args, paths);
     }
 
@@ -95,7 +93,7 @@ static void inner(vcpkg::Filesystem& fs, const VcpkgCmdArguments& args)
 
     if (const auto command_function = find_command(Commands::get_available_triplet_commands()))
     {
-        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::CommandName, command_function->name);
+        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::CommandName, command_function->name);
         return command_function->function->perform_and_exit(args, paths, default_triplet, host_triplet);
     }
 
@@ -318,7 +316,7 @@ int main(const int argc, const char* const* const argv)
         exc_msg = "unknown error(...)";
     }
 
-    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error, exc_msg);
+    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error, exc_msg);
 
     fflush(stdout);
     msg::println(msgVcpkgHasCrashed);
diff --git a/src/vcpkg/binarycaching.cpp b/src/vcpkg/binarycaching.cpp
index a43ceb0a2f..b32ba152c0 100644
--- a/src/vcpkg/binarycaching.cpp
+++ b/src/vcpkg/binarycaching.cpp
@@ -1579,7 +1579,7 @@ namespace
             auto maybe_cachepath = get_environment_variable("VCPKG_DEFAULT_BINARY_CACHE");
             if (auto p_str = maybe_cachepath.get())
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::VcpkgDefaultBinaryCache);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::VcpkgDefaultBinaryCache);
                 Path path = *p_str;
                 path.make_preferred();
                 if (!get_real_filesystem().is_directory(path))
@@ -1998,14 +1998,14 @@ namespace
             }
 
             static const std::map<StringLiteral, Metrics::DefineMetric> metric_names{
-                {"aws", Metrics::DefineMetric::BinaryCachingAws},
-                {"azblob", Metrics::DefineMetric::BinaryCachingAzBlob},
-                {"cos", Metrics::DefineMetric::BinaryCachingCos},
-                {"default", Metrics::DefineMetric::BinaryCachingDefault},
-                {"files", Metrics::DefineMetric::BinaryCachingFiles},
-                {"gcs", Metrics::DefineMetric::BinaryCachingGcs},
-                {"http", Metrics::DefineMetric::BinaryCachingHttp},
-                {"nuget", Metrics::DefineMetric::BinaryCachingNuget},
+                {"aws", Metrics::BinaryCachingAws},
+                {"azblob", Metrics::BinaryCachingAzBlob},
+                {"cos", Metrics::BinaryCachingCos},
+                {"default", Metrics::BinaryCachingDefault},
+                {"files", Metrics::BinaryCachingFiles},
+                {"gcs", Metrics::BinaryCachingGcs},
+                {"http", Metrics::BinaryCachingHttp},
+                {"nuget", Metrics::BinaryCachingNuget},
             };
             auto metrics = LockGuardPtr<Metrics>(g_metrics);
             for (const auto& cache_provider : state->binary_cache_providers)
@@ -2147,7 +2147,7 @@ ExpectedS<DownloadManagerConfig> vcpkg::parse_download_configuration(const Optio
 {
     if (!arg || arg.get()->empty()) return DownloadManagerConfig{};
 
-    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::AssetSource);
+    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::AssetSource);
 
     AssetSourcesState s;
     AssetSourcesParser parser(*arg.get(), Strings::concat("$", VcpkgCmdArguments::ASSET_SOURCES_ENV), &s);
@@ -2202,12 +2202,12 @@ ExpectedS<BinaryConfigParserState> vcpkg::create_binary_providers_from_configs_p
         LockGuardPtr<Metrics> metrics(g_metrics);
         if (!env_string.empty())
         {
-            metrics->track_property(Metrics::DefineMetric::VcpkgBinarySources);
+            metrics->track_property(Metrics::VcpkgBinarySources);
         }
 
         if (args.size() != 0)
         {
-            metrics->track_property(Metrics::DefineMetric::BinaryCachingSource);
+            metrics->track_property(Metrics::BinaryCachingSource);
         }
     }
 
@@ -2346,7 +2346,7 @@ details::NuGetRepoInfo details::get_nuget_repo_info_from_env()
     auto vcpkg_nuget_repository = get_environment_variable("VCPKG_NUGET_REPOSITORY");
     if (auto p = vcpkg_nuget_repository.get())
     {
-        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::VcpkgNugetRepository);
+        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::VcpkgNugetRepository);
         return {std::move(*p)};
     }
 
@@ -2362,7 +2362,7 @@ details::NuGetRepoInfo details::get_nuget_repo_info_from_env()
         return {};
     }
 
-    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::GitHubRepository);
+    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::GitHubRepository);
     return {Strings::concat(gh_server, '/', gh_repo, ".git"),
             get_environment_variable("GITHUB_REF").value_or(""),
             get_environment_variable("GITHUB_SHA").value_or("")};
diff --git a/src/vcpkg/build.cpp b/src/vcpkg/build.cpp
index afa066061c..93f4937a29 100644
--- a/src/vcpkg/build.cpp
+++ b/src/vcpkg/build.cpp
@@ -947,8 +947,8 @@ namespace vcpkg
                                      buildtimeus);
             if (!succeeded(return_code))
             {
-                metrics->track_property(Metrics::StringMetric::Error, "build failed");
-                metrics->track_property(Metrics::StringMetric::BuildError, spec_string);
+                metrics->track_property(Metrics::Error, "build failed");
+                metrics->track_property(Metrics::BuildError, spec_string);
                 const auto logs = buildpath / Strings::concat("error-logs-", action.spec.triplet(), ".txt");
                 std::vector<std::string> error_logs;
                 if (fs.exists(logs, VCPKG_LINE_INFO))
diff --git a/src/vcpkg/commands.add.cpp b/src/vcpkg/commands.add.cpp
index 4d150435cc..4c742b4e4c 100644
--- a/src/vcpkg/commands.add.cpp
+++ b/src/vcpkg/commands.add.cpp
@@ -46,8 +46,8 @@ namespace vcpkg::Commands
             auto artifact_hash = Hash::get_string_hash(artifact_name, Hash::Algorithm::Sha256);
             {
                 auto metrics = LockGuardPtr<Metrics>(g_metrics);
-                metrics->track_property(Metrics::StringMetric::CommandContext, "artifact");
-                metrics->track_property(Metrics::StringMetric::CommandArgs, artifact_hash);
+                metrics->track_property(Metrics::CommandContext, "artifact");
+                metrics->track_property(Metrics::CommandArgs, artifact_hash);
             } // unlock g_metrics
 
             std::string ce_args[] = {"add", artifact_name};
@@ -122,8 +122,8 @@ namespace vcpkg::Commands
                                                    }));
             {
                 auto metrics = LockGuardPtr<Metrics>(g_metrics);
-                metrics->track_property(Metrics::StringMetric::CommandContext, "port");
-                metrics->track_property(Metrics::StringMetric::CommandArgs, command_args_hash);
+                metrics->track_property(Metrics::CommandContext, "port");
+                metrics->track_property(Metrics::CommandArgs, command_args_hash);
             } // unlock metrics
 
             Checks::exit_success(VCPKG_LINE_INFO);
diff --git a/src/vcpkg/commands.find.cpp b/src/vcpkg/commands.find.cpp
index 4ed7c92407..b0ad1ee420 100644
--- a/src/vcpkg/commands.find.cpp
+++ b/src/vcpkg/commands.find.cpp
@@ -237,10 +237,10 @@ namespace vcpkg::Commands
             auto args_hash = Hash::get_string_hash(filter.value_or_exit(VCPKG_LINE_INFO), Hash::Algorithm::Sha256);
             {
                 auto metrics = LockGuardPtr<Metrics>(g_metrics);
-                metrics->track_property(Metrics::StringMetric::CommandContext, "artifact");
+                metrics->track_property(Metrics::CommandContext, "artifact");
                 if (auto p_filter_hash = filter_hash.get())
                 {
-                    metrics->track_property(Metrics::StringMetric::CommandArgs, *p_filter_hash);
+                    metrics->track_property(Metrics::CommandArgs, *p_filter_hash);
                 }
             } // unlock metrics
 
@@ -252,10 +252,10 @@ namespace vcpkg::Commands
             Optional<std::string> filter_hash = filter.map(Hash::get_string_sha256);
             {
                 auto metrics = LockGuardPtr<Metrics>(g_metrics);
-                metrics->track_property(Metrics::StringMetric::CommandContext, "port");
+                metrics->track_property(Metrics::CommandContext, "port");
                 if (auto p_filter_hash = filter_hash.get())
                 {
-                    metrics->track_property(Metrics::StringMetric::CommandArgs, *p_filter_hash);
+                    metrics->track_property(Metrics::CommandArgs, *p_filter_hash);
                 }
             } // unlock metrics
 
diff --git a/src/vcpkg/commands.integrate.cpp b/src/vcpkg/commands.integrate.cpp
index e666258d69..a0db89fefd 100644
--- a/src/vcpkg/commands.integrate.cpp
+++ b/src/vcpkg/commands.integrate.cpp
@@ -472,8 +472,8 @@ namespace vcpkg::Commands::Integrate
                                    .append_raw("\n" + script_path.generic_u8string()));
             {
                 auto locked_metrics = LockGuardPtr<Metrics>(g_metrics);
-                locked_metrics->track_property(Metrics::StringMetric::Error, "powershell script failed");
-                locked_metrics->track_property(Metrics::StringMetric::Title, TITLE.to_string());
+                locked_metrics->track_property(Metrics::Error, "powershell script failed");
+                locked_metrics->track_property(Metrics::Title, TITLE.to_string());
             }
         }
 
diff --git a/src/vcpkg/commands.setinstalled.cpp b/src/vcpkg/commands.setinstalled.cpp
index af2931818b..3f9ff48bef 100644
--- a/src/vcpkg/commands.setinstalled.cpp
+++ b/src/vcpkg/commands.setinstalled.cpp
@@ -164,7 +164,7 @@ namespace vcpkg::Commands::SetInstalled
         auto it_pkgsconfig = options.settings.find(OPTION_WRITE_PACKAGES_CONFIG);
         if (it_pkgsconfig != options.settings.end())
         {
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::X_WriteNugetPackagesConfig);
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::X_WriteNugetPackagesConfig);
             pkgsconfig = it_pkgsconfig->second;
         }
 
diff --git a/src/vcpkg/input.cpp b/src/vcpkg/input.cpp
index c44aa3a5f6..b172c221c7 100644
--- a/src/vcpkg/input.cpp
+++ b/src/vcpkg/input.cpp
@@ -35,8 +35,7 @@ namespace vcpkg
         if (!paths.is_valid_triplet(t))
         {
             print2(Color::error, "Error: invalid triplet: ", t, '\n');
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error,
-                                                             "invalid triplet: " + t.to_string());
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error, "invalid triplet: " + t.to_string());
             Help::help_topic_valid_triplet(paths);
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
diff --git a/src/vcpkg/install.cpp b/src/vcpkg/install.cpp
index 5970d74fa0..a62adfd6d9 100644
--- a/src/vcpkg/install.cpp
+++ b/src/vcpkg/install.cpp
@@ -875,8 +875,7 @@ namespace vcpkg
                                                  : UnsupportedPortAction::Error;
         const bool no_print_usage = Util::Sets::contains(options.switches, OPTION_NO_PRINT_USAGE);
 
-        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::BoolMetric::InstallManifestMode,
-                                                         paths.manifest_mode_enabled());
+        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::InstallManifestMode, paths.manifest_mode_enabled());
 
         if (auto p = paths.get_manifest().get())
         {
@@ -966,7 +965,7 @@ namespace vcpkg
             auto it_pkgsconfig = options.settings.find(OPTION_WRITE_PACKAGES_CONFIG);
             if (it_pkgsconfig != options.settings.end())
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::X_WriteNugetPackagesConfig);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::X_WriteNugetPackagesConfig);
                 pkgsconfig = Path(it_pkgsconfig->second);
             }
             auto maybe_manifest_scf =
@@ -1034,12 +1033,12 @@ namespace vcpkg
                     return dep.constraint.type != VersionConstraintKind::None;
                 }))
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::ManifestVersionConstraint);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ManifestVersionConstraint);
             }
 
             if (!manifest_core.overrides.empty())
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::ManifestOverrides);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ManifestOverrides);
             }
 
             auto verprovider = make_versioned_portfile_provider(paths);
@@ -1169,7 +1168,7 @@ namespace vcpkg
         auto it_pkgsconfig = options.settings.find(OPTION_WRITE_PACKAGES_CONFIG);
         if (it_pkgsconfig != options.settings.end())
         {
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::X_WriteNugetPackagesConfig);
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::X_WriteNugetPackagesConfig);
             compute_all_abis(paths, action_plan, var_provider, status_db);
 
             auto pkgsconfig_path = paths.original_cwd / it_pkgsconfig->second;
@@ -1318,6 +1317,6 @@ namespace vcpkg
                                             Hash::get_string_hash(version_as_string, Hash::Algorithm::Sha256));
         }
 
-        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::InstallPlan_1, specs_string);
+        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::InstallPlan_1, specs_string);
     }
 }
diff --git a/src/vcpkg/metrics.cpp b/src/vcpkg/metrics.cpp
index db32fd1871..9cb48b1707 100644
--- a/src/vcpkg/metrics.cpp
+++ b/src/vcpkg/metrics.cpp
@@ -316,7 +316,7 @@ namespace vcpkg
             g_metricmessage.user_id = config.user_id;
             g_metricmessage.user_timestamp = config.user_time;
 
-            metrics->track_property(Metrics::StringMetric::UserMac, config.user_mac);
+            metrics->track_property(Metrics::UserMac, config.user_mac);
 
             g_metrics_disabled = false;
         }
diff --git a/src/vcpkg/portfileprovider.cpp b/src/vcpkg/portfileprovider.cpp
index d7c22d1bb0..2609f9686f 100644
--- a/src/vcpkg/portfileprovider.cpp
+++ b/src/vcpkg/portfileprovider.cpp
@@ -204,7 +204,7 @@ namespace vcpkg
                     }
                     else
                     {
-                        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::VersioningErrorVersion);
+                        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::VersioningErrorVersion);
                         return maybe_path.error();
                     }
                 }
diff --git a/src/vcpkg/registries.cpp b/src/vcpkg/registries.cpp
index ef058aeadf..ad882e7f1d 100644
--- a/src/vcpkg/registries.cpp
+++ b/src/vcpkg/registries.cpp
@@ -85,8 +85,7 @@ namespace
                     e.commit_id(), registry_versions_dir_name.to_string());
                 if (!maybe_tree)
                 {
-                    LockGuardPtr<Metrics>(g_metrics)->track_property(
-                        Metrics::DefineMetric::RegistriesErrorNoVersionsAtCommit);
+                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::RegistriesErrorNoVersionsAtCommit);
                     Checks::exit_with_message(
                         VCPKG_LINE_INFO,
                         "Error: could not find the git tree for `versions` in repo `%s` at commit `%s`: %s",
@@ -661,8 +660,7 @@ namespace
                 auto maybe_err = m_paths.git_fetch(m_repo, m_baseline_identifier);
                 if (!maybe_err)
                 {
-                    LockGuardPtr<Metrics>(g_metrics)->track_property(
-                        Metrics::DefineMetric::RegistriesErrorCouldNotFindBaseline);
+                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::RegistriesErrorCouldNotFindBaseline);
                     Checks::exit_with_message(
                         VCPKG_LINE_INFO,
                         "Error: Couldn't find baseline `\"%s\"` for repo %s:\n%s\nError: Failed to fetch %s:\n%s",
@@ -678,8 +676,7 @@ namespace
 
             if (!maybe_contents)
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(
-                    Metrics::DefineMetric::RegistriesErrorCouldNotFindBaseline);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::RegistriesErrorCouldNotFindBaseline);
                 Checks::exit_with_message(VCPKG_LINE_INFO,
                                           "Error: Couldn't find baseline in commit `\"%s\"` from repo %s:\n%s\n",
                                           m_baseline_identifier,
@@ -697,8 +694,7 @@ namespace
                 }
                 else
                 {
-                    LockGuardPtr<Metrics>(g_metrics)->track_property(
-                        Metrics::DefineMetric::RegistriesErrorCouldNotFindBaseline);
+                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::RegistriesErrorCouldNotFindBaseline);
                     Checks::exit_maybe_upgrade(
                         VCPKG_LINE_INFO,
                         "The baseline.json from commit `\"%s\"` in the repo %s did not contain a \"default\" field.",
diff --git a/src/vcpkg/sourceparagraph.cpp b/src/vcpkg/sourceparagraph.cpp
index f73c569ee7..ad17cd23f4 100644
--- a/src/vcpkg/sourceparagraph.cpp
+++ b/src/vcpkg/sourceparagraph.cpp
@@ -1290,8 +1290,7 @@ namespace vcpkg
                 {
                     if (dep.constraint.type != VersionConstraintKind::None)
                     {
-                        LockGuardPtr<Metrics>(g_metrics)->track_property(
-                            Metrics::DefineMetric::ErrorVersioningDisabled);
+                        LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ErrorVersioningDisabled);
                         return Strings::concat(
                             origin,
                             " was rejected because it uses constraints and the `",
@@ -1312,7 +1311,7 @@ namespace vcpkg
 
             if (core_paragraph->overrides.size() != 0)
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::ErrorVersioningDisabled);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ErrorVersioningDisabled);
                 return Strings::concat(
                     origin,
                     format_error_message(ManifestDeserializer::OVERRIDES, VcpkgCmdArguments::VERSIONS_FEATURE),
@@ -1321,7 +1320,7 @@ namespace vcpkg
 
             if (core_paragraph->builtin_baseline.has_value())
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::ErrorVersioningDisabled);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ErrorVersioningDisabled);
                 return Strings::concat(
                     origin,
                     format_error_message(ManifestDeserializer::BUILTIN_BASELINE, VcpkgCmdArguments::VERSIONS_FEATURE),
@@ -1338,7 +1337,7 @@ namespace vcpkg
                                     return dependency.constraint.type != VersionConstraintKind::None;
                                 }))
                 {
-                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::ErrorVersioningNoBaseline);
+                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ErrorVersioningNoBaseline);
                     return Strings::concat(
                         origin,
                         " was rejected because it uses \"version>=\" and does not have a \"builtin-baseline\".\n",
@@ -1347,7 +1346,7 @@ namespace vcpkg
 
                 if (!core_paragraph->overrides.empty())
                 {
-                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::ErrorVersioningNoBaseline);
+                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ErrorVersioningNoBaseline);
                     return Strings::concat(
                         origin,
                         " was rejected because it uses \"overrides\" and does not have a \"builtin-baseline\".\n",
diff --git a/src/vcpkg/vcpkgcmdarguments.cpp b/src/vcpkg/vcpkgcmdarguments.cpp
index ed016a74f2..c3ae2e4c5d 100644
--- a/src/vcpkg/vcpkgcmdarguments.cpp
+++ b/src/vcpkg/vcpkgcmdarguments.cpp
@@ -39,7 +39,7 @@ namespace vcpkg
                 if (place.has_value())
                 {
                     msg::println_error(msgTwoFeatureFlagsSpecified, msg::value = flag);
-                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error,
+                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error,
                                                                      "error feature flag +-" + flag.to_string());
                     Checks::exit_fail(VCPKG_LINE_INFO);
                 }
@@ -79,8 +79,7 @@ namespace vcpkg
         if (nullptr != option_field)
         {
             msg::println_error(msgDuplicateOptions, msg::value = option_name);
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error,
-                                                             "error option specified multiple times");
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error, "error option specified multiple times");
             print_usage();
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
@@ -93,8 +92,7 @@ namespace vcpkg
         if (option_field && option_field != new_setting)
         {
             msg::println_error(msgConflictingValuesForOption, msg::option = option_name);
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error,
-                                                             "error conflicting switches");
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error, "error conflicting switches");
             print_usage();
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
@@ -108,7 +106,7 @@ namespace vcpkg
         if (new_value.size() == 0)
         {
             msg::println_error(msgExpectedValueForOption, msg::option = option_name);
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error, "error option name");
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error, "error option name");
             print_usage();
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
@@ -123,7 +121,7 @@ namespace vcpkg
         if (new_value.size() == 0)
         {
             msg::println_error(msgExpectedValueForOption, msg::option = option_name);
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error, "error option name");
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error, "error option name");
             print_usage();
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
@@ -190,7 +188,7 @@ namespace vcpkg
                 }
 
                 msg::println_error(msgExpectedValueForOption, msg::option = option);
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error, "error option name");
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error, "error option name");
                 print_usage();
                 Checks::exit_fail(VCPKG_LINE_INFO);
             }
@@ -263,7 +261,7 @@ namespace vcpkg
 
             if (basic_arg.size() >= 2 && basic_arg[0] == '-' && basic_arg[1] != '-')
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::Error,
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::Error,
                                                                  "error short options are not supported");
                 Checks::msg_exit_with_message(VCPKG_LINE_INFO, msgUnsupportedShortOptions, msg::value = basic_arg);
             }
@@ -839,7 +837,7 @@ namespace vcpkg
                     msgSpecifiedFeatureTurnedOff, msg::command_name = el.flag, msg::option = el.option);
                 msg::println_warning(msgDefaultFlag, msg::option = el.flag);
                 LockGuardPtr<Metrics>(g_metrics)->track_property(
-                    Metrics::StringMetric::Warning, Strings::format("warning %s alongside %s", el.flag, el.option));
+                    Metrics::Warning, Strings::format("warning %s alongside %s", el.flag, el.option));
             }
         }
     }
diff --git a/src/vcpkg/vcpkglib.cpp b/src/vcpkg/vcpkglib.cpp
index 72405346b3..be5196c115 100644
--- a/src/vcpkg/vcpkglib.cpp
+++ b/src/vcpkg/vcpkglib.cpp
@@ -111,7 +111,7 @@ namespace vcpkg
         if (!was_tracked)
         {
             was_tracked = true;
-            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::StringMetric::ListFile, "update to new format");
+            LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ListFile, "update to new format");
         }
 
         // The files are sorted such that directories are placed just before the files they contain
diff --git a/src/vcpkg/vcpkgpaths.cpp b/src/vcpkg/vcpkgpaths.cpp
index 63f5a74d3e..6dfd495bd5 100644
--- a/src/vcpkg/vcpkgpaths.cpp
+++ b/src/vcpkg/vcpkgpaths.cpp
@@ -187,10 +187,10 @@ namespace vcpkg
         {
             if (auto p_baseline = manifest->builtin_baseline.get())
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::ManifestBaseline);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::ManifestBaseline);
                 if (!is_git_commit_sha(*p_baseline))
                 {
-                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::VersioningErrorBaseline);
+                    LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::VersioningErrorBaseline);
                     Checks::exit_maybe_upgrade(VCPKG_LINE_INFO,
                                                "Error: the top-level builtin-baseline%s was not a valid commit sha: "
                                                "expected 40 hexadecimal characters.\n%s\n",
@@ -325,7 +325,7 @@ namespace vcpkg
             Path ret;
             if (args.registries_cache_dir)
             {
-                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::DefineMetric::X_VcpkgRegistriesCache);
+                LockGuardPtr<Metrics>(g_metrics)->track_property(Metrics::X_VcpkgRegistriesCache);
                 ret = *args.registries_cache_dir;
                 const auto status = get_real_filesystem().status(ret, VCPKG_LINE_INFO);
                 if (!vcpkg::exists(status))
@@ -666,12 +666,11 @@ namespace vcpkg
             LockGuardPtr<Metrics> metrics(g_metrics);
             if (default_registry)
             {
-                metrics->track_property(Metrics::StringMetric::RegistriesDefaultRegistryKind,
-                                        default_registry->kind().to_string());
+                metrics->track_property(Metrics::RegistriesDefaultRegistryKind, default_registry->kind().to_string());
             }
             else
             {
-                metrics->track_property(Metrics::StringMetric::RegistriesDefaultRegistryKind, "disabled");
+                metrics->track_property(Metrics::RegistriesDefaultRegistryKind, "disabled");
             }
 
             if (other_registries.size() != 0)
@@ -682,7 +681,7 @@ namespace vcpkg
                     registry_kinds.push_back(reg.implementation().kind());
                 }
                 Util::sort_unique_erase(registry_kinds);
-                metrics->track_property(Metrics::StringMetric::RegistriesKindsUsed, Strings::join(",", registry_kinds));
+                metrics->track_property(Metrics::RegistriesKindsUsed, Strings::join(",", registry_kinds));
             }
         }
     }