diff --git a/logging_state_migrate.go b/logging_state_migrate.go
index 00be0a4..0693d94 100644
--- a/logging_state_migrate.go
+++ b/logging_state_migrate.go
@@ -5,36 +5,36 @@
 
 const (
 	// Provider installation messages
-	ProviderInstallationStart           LogMessageType = "provider_installation_start"
-	StateStoreProviderInstallationStart LogMessageType = "state_store_provider_installation_start"
-	ProviderQueryUsePreviousVersion     LogMessageType = "provider_query_use_previous_version"
-	ProviderQueryUsePreviousConstraints LogMessageType = "provider_query_use_constraints"
-	ProviderQueryUseLatest              LogMessageType = "provider_query_use_latest"
-	ProviderVersionAlreadyInstalled     LogMessageType = "provider_version_already_installed"
-	ProviderVersionFoundInCacheDir      LogMessageType = "provider_version_found_in_cache_dir"
-	ProviderVersionInstallationStart    LogMessageType = "provider_version_installation_start"
-	ProviderVersionInstallationComplete LogMessageType = "provider_version_installation_complete"
-	BuiltInProviderAvailable            LogMessageType = "built_in_provider_available"
-	ThirdPartyProvidersInstalled        LogMessageType = "third_party_providers_installed"
+	MessageProviderInstallationStart           LogMessageType = "provider_installation_start"
+	MessageStateStoreProviderInstallationStart LogMessageType = "state_store_provider_installation_start"
+	MessageProviderQueryUsePreviousVersion     LogMessageType = "provider_query_use_previous_version"
+	MessageProviderQueryUsePreviousConstraints LogMessageType = "provider_query_use_constraints"
+	MessageProviderQueryUseLatest              LogMessageType = "provider_query_use_latest"
+	MessageProviderVersionAlreadyInstalled     LogMessageType = "provider_version_already_installed"
+	MessageProviderVersionFoundInCacheDir      LogMessageType = "provider_version_found_in_cache_dir"
+	MessageProviderVersionInstallationStart    LogMessageType = "provider_version_installation_start"
+	MessageProviderVersionInstallationComplete LogMessageType = "provider_version_installation_complete"
+	MessageBuiltInProviderAvailable            LogMessageType = "built_in_provider_available"
+	MessageThirdPartyProvidersInstalled        LogMessageType = "third_party_providers_installed"
 
 	// Dependency lock file messages
-	ProviderLockfileCreated LogMessageType = "provider_lockfile_created"
-	ProviderLockfileUpdated LogMessageType = "provider_lockfile_updated"
+	MessageProviderLockfileCreated LogMessageType = "provider_lockfile_created"
+	MessageProviderLockfileUpdated LogMessageType = "provider_lockfile_updated"
 
 	// Provider trust-related messages
-	ProviderInteractiveApproval  LogMessageType = "provider_interactive_approval"
-	ProviderInteractiveRejection LogMessageType = "provider_interactive_rejection"
-	ProviderAutomaticApproval    LogMessageType = "provider_automatic_approval"
+	MessageProviderInteractiveApproval  LogMessageType = "provider_interactive_approval"
+	MessageProviderInteractiveRejection LogMessageType = "provider_interactive_rejection"
+	MessageProviderAutomaticApproval    LogMessageType = "provider_automatic_approval"
 
 	// State migration-related messages
-	LogMigrationStart                             LogMessageType = "migration_start"
-	LogMigrationComplete                          LogMessageType = "migration_complete"
-	LogMigrationErrored                           LogMessageType = "migration_errored"
-	LogMigrationFinalized                         LogMessageType = "migration_finalized"
-	LogMigrationSourceInitializationStart         LogMessageType = "migration_source_initialization_start"
-	LogMigrationSourceInitializationComplete      LogMessageType = "migration_source_initialization_complete"
-	LogMigrationDestinationInitializationStart    LogMessageType = "migration_destination_initialization_start"
-	LogMigrationDestinationInitializationComplete LogMessageType = "migration_destination_initialization_complete"
+	MessageMigrationStart                             LogMessageType = "migration_start"
+	MessageMigrationComplete                          LogMessageType = "migration_complete"
+	MessageMigrationErrored                           LogMessageType = "migration_errored"
+	MessageMigrationFinalized                         LogMessageType = "migration_finalized"
+	MessageMigrationSourceInitializationStart         LogMessageType = "migration_source_initialization_start"
+	MessageMigrationSourceInitializationComplete      LogMessageType = "migration_source_initialization_complete"
+	MessageMigrationDestinationInitializationStart    LogMessageType = "migration_destination_initialization_start"
+	MessageMigrationDestinationInitializationComplete LogMessageType = "migration_destination_initialization_complete"
 )
 
 type ProviderInstallationStartMessage struct {
diff --git a/logging_types.go b/logging_types.go
index 3e905f6..f38d9d7 100644
--- a/logging_types.go
+++ b/logging_types.go
@@ -99,79 +99,79 @@
 
 	// state migrate
 	// provider installation
-	case ProviderInstallationStart:
+	case MessageProviderInstallationStart:
 		v := ProviderInstallationStartMessage{}
 		return v, d.Decode(&v)
-	case StateStoreProviderInstallationStart:
+	case MessageStateStoreProviderInstallationStart:
 		v := StateStoreProviderInstallationStartMessage{}
 		return v, d.Decode(&v)
-	case ProviderQueryUsePreviousVersion:
+	case MessageProviderQueryUsePreviousVersion:
 		v := ProviderQueryUsePreviousVersionMessage{}
 		return v, d.Decode(&v)
-	case ProviderQueryUsePreviousConstraints:
+	case MessageProviderQueryUsePreviousConstraints:
 		v := ProviderQueryUsePreviousConstraintsMessage{}
 		return v, d.Decode(&v)
-	case ProviderQueryUseLatest:
+	case MessageProviderQueryUseLatest:
 		v := ProviderQueryUseLatestMessage{}
 		return v, d.Decode(&v)
-	case ProviderVersionAlreadyInstalled:
+	case MessageProviderVersionAlreadyInstalled:
 		v := ProviderVersionAlreadyInstalledMessage{}
 		return v, d.Decode(&v)
-	case ProviderVersionFoundInCacheDir:
+	case MessageProviderVersionFoundInCacheDir:
 		v := ProviderVersionFoundInCacheDirMessage{}
 		return v, d.Decode(&v)
-	case ProviderVersionInstallationStart:
+	case MessageProviderVersionInstallationStart:
 		v := ProviderVersionInstallationStartMessage{}
 		return v, d.Decode(&v)
-	case ProviderVersionInstallationComplete:
+	case MessageProviderVersionInstallationComplete:
 		v := ProviderVersionInstallationCompleteMessage{}
 		return v, d.Decode(&v)
-	case BuiltInProviderAvailable:
+	case MessageBuiltInProviderAvailable:
 		v := BuiltInProviderAvailableMessage{}
 		return v, d.Decode(&v)
-	case ThirdPartyProvidersInstalled:
+	case MessageThirdPartyProvidersInstalled:
 		v := ThirdPartyProvidersInstalledMessage{}
 		return v, d.Decode(&v)
 	// dependency lock file
-	case ProviderLockfileCreated:
+	case MessageProviderLockfileCreated:
 		v := ProviderLockfileCreatedMessage{}
 		return v, d.Decode(&v)
-	case ProviderLockfileUpdated:
+	case MessageProviderLockfileUpdated:
 		v := ProviderLockfileUpdatedMessage{}
 		return v, d.Decode(&v)
 	// provider trust
-	case ProviderInteractiveApproval:
+	case MessageProviderInteractiveApproval:
 		v := ProviderInteractiveApprovalMessage{}
 		return v, d.Decode(&v)
-	case ProviderInteractiveRejection:
+	case MessageProviderInteractiveRejection:
 		v := ProviderInteractiveRejectionMessage{}
 		return v, d.Decode(&v)
-	case ProviderAutomaticApproval:
+	case MessageProviderAutomaticApproval:
 		v := ProviderAutomaticApprovalMessage{}
 		return v, d.Decode(&v)
 	// state migration
-	case LogMigrationStart:
+	case MessageMigrationStart:
 		v := MigrationStartMessage{}
 		return v, d.Decode(&v)
-	case LogMigrationComplete:
+	case MessageMigrationComplete:
 		v := MigrationCompleteMessage{}
 		return v, d.Decode(&v)
-	case LogMigrationErrored:
+	case MessageMigrationErrored:
 		v := MigrationErroredMessage{}
 		return v, d.Decode(&v)
-	case LogMigrationFinalized:
+	case MessageMigrationFinalized:
 		v := MigrationFinalizedMessage{}
 		return v, d.Decode(&v)
-	case LogMigrationSourceInitializationStart:
+	case MessageMigrationSourceInitializationStart:
 		v := MigrationSourceInitializationStartMessage{}
 		return v, d.Decode(&v)
-	case LogMigrationSourceInitializationComplete:
+	case MessageMigrationSourceInitializationComplete:
 		v := MigrationSourceInitializationCompleteMessage{}
 		return v, d.Decode(&v)
-	case LogMigrationDestinationInitializationStart:
+	case MessageMigrationDestinationInitializationStart:
 		v := MigrationDestinationInitializationStartMessage{}
 		return v, d.Decode(&v)
-	case LogMigrationDestinationInitializationComplete:
+	case MessageMigrationDestinationInitializationComplete:
 		v := MigrationDestinationInitializationCompleteMessage{}
 		return v, d.Decode(&v)
 	}