diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/registry_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/registry_utils.py
index 315ca4d85d..1c895c0cb0 100644
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/registry_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/registry_utils.py
@@ -9,12 +9,12 @@ import winreg
 
 logger = logging.getLogger(__name__)
 
-LUMBERYARD_SETTINGS_PATH = r'Software\Amazon\Lumberyard\Settings'
+LUMBERYARD_SETTINGS_PATH = r'Software\O3DE\O3DE\Settings'
 
 def set_ly_registry_value(reg_path, value_name, new_value, value_type=winreg.REG_DWORD):
     """
     Sets the specified value for the specified value_name in the LY registry key.
-    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\Amazon\Lumberyard\Settings)
+    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\O3DE\O3DE\Settings)
     :param value_name: A string that identifies the value name (e.g. UndoLevels, ViewportInteractionModel)
     :param new_value: Value to set on the specified value_name
     :param value_type: The type of value set. Defaults to a 32-bit number.
@@ -40,7 +40,7 @@ def set_ly_registry_value(reg_path, value_name, new_value, value_type=winreg.REG
 def get_ly_registry_value(reg_path, value_name):
     """
     Gets the current value for an existing value_name in the LY registry key.
-    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\Amazon\Lumberyard\Settings)
+    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\O3DE\O3DE\Settings)
     :param value_name: A string that identifies the value name (e.g. UndoLevels, ViewportInteractionModel)
     :return: Value set for the specified value_name
     """
@@ -62,7 +62,7 @@ def get_ly_registry_value(reg_path, value_name):
 def delete_ly_registry_value(reg_path, value_name):
     """
     Deletes the specific registry value_name found in the reg_path key.
-    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\Amazon\Lumberyard\Settings)
+    :param reg_path: A string that identifies the registry path to the desired key (e.g. Software\O3DE\O3DE\Settings)
     :param value_name: A string that identifies the value name (e.g. UndoLevels, ViewportInteractionModel)
     :return: None
     """
diff --git a/AutomatedTesting/Gem/PythonTests/editor/conftest.py b/AutomatedTesting/Gem/PythonTests/editor/conftest.py
index 2b26370126..6fbe88c5e3 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/conftest.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/conftest.py
@@ -14,12 +14,12 @@ logger = logging.getLogger(__name__)
 
 
 layout = {
-    'path': r'Software\Amazon\O3DE\Editor\fancyWindowLayouts',
+    'path': r'Software\O3DE\O3DE\Editor\fancyWindowLayouts',
     'value': 'last'
 }
 restore_camera = {
     'new': 16384,
-    'path': r'Software\Amazon\Lumberyard\Editor\AutoHide',
+    'path': r'Software\O3DE\O3DE\Editor\AutoHide',
     'value': 'ViewportCameraRestoreOnExitGameMode'
 }
 
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp
index 01c935323d..872050effc 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/main.cpp
@@ -129,8 +129,8 @@ int main(int argc, char **argv)
 {
     ComponentApplicationWrapper componentApplicationWrapper;
 
-    QApplication::setOrganizationName("Amazon");
-    QApplication::setOrganizationDomain("amazon.com");
+    QApplication::setOrganizationName("O3DE");
+    QApplication::setOrganizationDomain("o3de.org");
     QApplication::setApplicationName("O3DEWidgetGallery");
 
     QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication.cpp b/Code/Sandbox/Editor/Core/QtEditorApplication.cpp
index 5554498bfd..5c342772a8 100644
--- a/Code/Sandbox/Editor/Core/QtEditorApplication.cpp
+++ b/Code/Sandbox/Editor/Core/QtEditorApplication.cpp
@@ -252,8 +252,8 @@ namespace Editor
         setWindowIcon(QIcon(":/Application/res/o3de_editor.ico"));
 
         // set the default key store for our preferences:
-        setOrganizationName("Amazon");
-        setOrganizationDomain("amazon.com");
+        setOrganizationName("O3DE");
+        setOrganizationDomain("o3de.org");
         setApplicationName("O3DE Editor");
 
         connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle);
diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp
index cff4ea8e4f..ceced74070 100644
--- a/Code/Sandbox/Editor/CryEdit.cpp
+++ b/Code/Sandbox/Editor/CryEdit.cpp
@@ -1654,7 +1654,7 @@ BOOL CCryEditApp::InitInstance()
     GetIEditor()->GetCommandManager()->RegisterAutoCommands();
     GetIEditor()->AddUIEnums();
 
-    mainWindowWrapper->enableSaveRestoreGeometry("amazon", "O3DE", "mainWindowGeometry");
+    mainWindowWrapper->enableSaveRestoreGeometry("O3DE", "O3DE", "mainWindowGeometry");
     m_pDocManager->OnFileNew();
 
     if (IsInRegularEditorMode())
diff --git a/Code/Sandbox/Editor/EditorPanelUtils.cpp b/Code/Sandbox/Editor/EditorPanelUtils.cpp
index 27a123f3b8..0369a117b5 100644
--- a/Code/Sandbox/Editor/EditorPanelUtils.cpp
+++ b/Code/Sandbox/Editor/EditorPanelUtils.cpp
@@ -240,7 +240,7 @@ public:
 
     virtual bool HotKey_LoadExisting() override
     {
-        QSettings settings("Amazon", "O3DE");
+        QSettings settings("O3DE", "O3DE");
         QString group = "Hotkeys/";
 
         HotKey_BuildDefaults();
@@ -276,7 +276,7 @@ public:
 
     virtual void HotKey_SaveCurrent() override
     {
-        QSettings settings("Amazon", "O3DE");
+        QSettings settings("O3DE", "O3DE");
         QString group = "Hotkeys/";
         settings.remove("Hotkeys/");
         settings.sync();
diff --git a/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp b/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp
index de4062e550..9236a3b205 100644
--- a/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp
+++ b/Code/Sandbox/Editor/GraphicsSettingsDialog.cpp
@@ -146,7 +146,7 @@ GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
         m_ui->m_platformEntry->addItem(platform);
     }
 
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("GraphicsSettingsDialog");
 
     if (settings.contains("Platform"))
@@ -174,7 +174,7 @@ GraphicsSettingsDialog::GraphicsSettingsDialog(QWidget* parent /* = nullptr */)
 
 GraphicsSettingsDialog::~GraphicsSettingsDialog()
 {
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("GraphicsSettingsDialog");
 
     auto platformCheck = [this](AZStd::pair<AZStd::string, ESystemConfigPlatform>& stringConfigPair) { return stringConfigPair.second == m_currentPlatform; };
@@ -556,7 +556,7 @@ void GraphicsSettingsDialog::LoadPlatformConfigurations()
 
     setUpdatesEnabled(true);
 
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("GraphicsSettingsDialog");
     settings.beginGroup("cvarGroup");
 
@@ -619,7 +619,7 @@ void GraphicsSettingsDialog::CleanUI()
 {
     setUpdatesEnabled(false);
 
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("GraphicsSettingsDialog");
     settings.beginGroup("cvarGroup");
 
diff --git a/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp b/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp
index 66a4ff7ba4..e2825ec3cc 100644
--- a/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp
+++ b/Code/Sandbox/Editor/KeyboardCustomizationSettings.cpp
@@ -104,7 +104,7 @@ void KeyboardCustomizationSettings::LoadDefaults()
 
 void KeyboardCustomizationSettings::Load()
 {
-    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
+    QSettings settings(QStringLiteral("O3DE"), QStringLiteral("O3DE"));
     settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
     settings.beginGroup(m_group);
 
@@ -151,7 +151,7 @@ void KeyboardCustomizationSettings::LoadFromSnapshot(const Snapshot& snapshot)
 
 void KeyboardCustomizationSettings::Save()
 {
-    QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE"));
+    QSettings settings(QStringLiteral("O3DE"), QStringLiteral("O3DE"));
     settings.beginGroup(QStringLiteral("Keyboard Shortcuts"));
     settings.beginGroup(m_group);
 
diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp
index 404b2a0a1c..a997aa06b9 100644
--- a/Code/Sandbox/Editor/MainWindow.cpp
+++ b/Code/Sandbox/Editor/MainWindow.cpp
@@ -299,7 +299,7 @@ MainWindow::MainWindow(QWidget* parent)
     , m_undoStateAdapter(new UndoStackStateAdapter(this))
     , m_keyboardCustomization(nullptr)
     , m_activeView(nullptr)
-    , m_settings("amazon", "O3DE") // TODO_KDAB: Replace with a central settings class
+    , m_settings("O3DE", "O3DE") 
     , m_toolbarManager(new ToolbarManager(m_actionManager, this))
     , m_assetImporterManager(new AssetImporterManager(this))
     , m_levelEditorMenuHandler(new LevelEditorMenuHandler(this, m_viewPaneManager, m_settings))
diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp
index f6c03ff010..f4009c5bbd 100644
--- a/Code/Sandbox/Editor/ToolbarManager.cpp
+++ b/Code/Sandbox/Editor/ToolbarManager.cpp
@@ -211,7 +211,7 @@ public:
 ToolbarManager::ToolbarManager(ActionManager* actionManager, MainWindow* mainWindow)
     : m_mainWindow(mainWindow)
     , m_actionManager(actionManager)
-    , m_settings("amazon", "O3DE")
+    , m_settings("O3DE", "O3DE")
     , m_expanderWatcher(new AmazonToolBarExpanderWatcher())
 {
     // Note that we don't actually save/load from AmazonToolbar::List
diff --git a/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp b/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
index cef9d1b08e..161936228b 100644
--- a/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
+++ b/Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp
@@ -1854,7 +1854,7 @@ void CTrackViewDialog::ReadMiscSettings()
 //////////////////////////////////////////////////////////////////////////
 void CTrackViewDialog::SaveLayouts()
 {
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("TrackView");
     QByteArray stateData = this->saveState();
     settings.setValue("layout", stateData);
@@ -1870,7 +1870,7 @@ void CTrackViewDialog::SaveLayouts()
 //////////////////////////////////////////////////////////////////////////
 void CTrackViewDialog::ReadLayouts()
 {
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("TrackView");
 
     setViewMode(static_cast<ViewMode>(settings.value("lastViewMode").toInt()));
diff --git a/Code/Sandbox/Editor/ViewportTitleDlg.cpp b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
index deee886d16..d600da7076 100644
--- a/Code/Sandbox/Editor/ViewportTitleDlg.cpp
+++ b/Code/Sandbox/Editor/ViewportTitleDlg.cpp
@@ -789,7 +789,7 @@ void CViewportTitleDlg::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, UINT_
 
 void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets)
 {
-    QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
+    QSettings settings("O3DE", "O3DE"); // Temporary solution until we have the global Settings class.
     settings.beginGroup(section);
     outCustompresets = settings.value(keyName).toStringList();
     settings.endGroup();
@@ -797,7 +797,7 @@ void CViewportTitleDlg::LoadCustomPresets(const QString& section, const QString&
 
 void CViewportTitleDlg::SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets)
 {
-    QSettings settings("Amazon", "O3DE"); // Temporary solution until we have the global Settings class.
+    QSettings settings("O3DE", "O3DE"); // Temporary solution until we have the global Settings class.
     settings.beginGroup(section);
     settings.setValue(keyName, custompresets);
     settings.endGroup();
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
index 9648824627..e3b6377023 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
@@ -639,7 +639,7 @@ bool ApplicationManager::Activate()
 
 QString ApplicationManager::GetOrganizationName() const
 {
-    return "Amazon";
+    return "O3DE";
 }
 
 QString ApplicationManager::GetApplicationName() const
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
index 037e3727d7..646333478a 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
@@ -63,7 +63,7 @@ namespace MaterialEditor
         auto mainWindowWrapper =
             new AzQtComponents::WindowDecorationWrapper(AzQtComponents::WindowDecorationWrapper::OptionAutoTitleBarButtons);
         mainWindowWrapper->setGuest(this);
-        mainWindowWrapper->enableSaveRestoreGeometry("amazon", "MaterialEditor", "mainWindowGeometry");
+        mainWindowWrapper->enableSaveRestoreGeometry("O3DE", "MaterialEditor", "mainWindowGeometry");
 
         // set the style sheet for RPE highlighting and other styling
         AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral(":/MaterialEditor.qss"));
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
index ab779d2277..1b03527587 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp
@@ -24,8 +24,8 @@
 
 int main(int argc, char** argv)
 {
-    QApplication::setOrganizationName("Amazon");
-    QApplication::setOrganizationDomain("amazon.com");
+    QApplication::setOrganizationName("O3DE");
+    QApplication::setOrganizationDomain("o3de.org");
     QApplication::setApplicationName("O3DE Material Editor");
 
     AzQtComponents::PrepareQtPaths();
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h
index 31c78e420b..02ce99180c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/RenderPlugins/Source/OpenGLRender/OpenGLRenderPlugin.h
@@ -35,7 +35,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "OpenGL Render Window"; }
         uint32 GetClassID() const override                  { return static_cast<uint32>(RenderPlugin::CLASS_ID); }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp
index b182d4972a..ab48fc7dcf 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/ActionHistory/ActionHistoryPlugin.cpp
@@ -54,7 +54,7 @@ namespace EMStudio
 
     const char* ActionHistoryPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
index 62cf14299d..69d6509b3b 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphPlugin.cpp
@@ -307,7 +307,7 @@ namespace EMStudio
     // get the creator name
     const char* AnimGraphPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
index df2a079930..9f161d41f2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/Attachments/AttachmentsPlugin.h
@@ -47,7 +47,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Attachments"; }
         uint32 GetClassID() const override                  { return AttachmentsPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp
index 8f7badd24f..7d58759bf0 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBar/CommandBarPlugin.cpp
@@ -63,7 +63,7 @@ namespace EMStudio
 
     const char* CommandBarPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
     float CommandBarPlugin::GetVersion() const
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h
index ee29f78fc3..95a66ceb3e 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/CommandBrowser/CommandBrowserPlugin.h
@@ -36,7 +36,7 @@ class CommandBrowserPlugin : public EMStudio::DockWidgetPlugin
         const char* GetCompileDate() const      { return MCORE_DATE; }
         const char* GetName() const             { return "Command Browser"; }
         uint32 GetClassID() const               { return CommandBrowserPlugin::CLASS_ID; }
-        const char* GetCreatorName() const      { return "Amazon"; }
+        const char* GetCreatorName() const      { return "O3DE"; }
         float GetVersion() const                { return 1.0f;  }
         bool IsClosable() const                 { return true;  }
         bool IsFloatable() const                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp
index f3c24b749c..2cb2eadfd7 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/LogWindow/LogWindowPlugin.cpp
@@ -59,7 +59,7 @@ namespace EMStudio
     // get the creator name
     const char* LogWindowPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h
index 90342e2a95..d5a13cd9ee 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MorphTargetsWindow/MorphTargetsWindowPlugin.h
@@ -40,7 +40,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Morph Targets"; }
         uint32 GetClassID() const override                  { return MorphTargetsWindowPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h
index e68d88ab32..ca70676b44 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionEvents/MotionEventsPlugin.h
@@ -43,7 +43,7 @@ namespace EMStudio
         const char* GetCompileDate() const override     { return MCORE_DATE; }
         const char* GetName() const override            { return "Motion Events"; }
         uint32 GetClassID() const override              { return MotionEventsPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override     { return "Amazon"; }
+        const char* GetCreatorName() const override     { return "O3DE"; }
         float GetVersion() const override               { return 1.0f;  }
         bool GetIsClosable() const override             { return true;  }
         bool GetIsFloatable() const override            { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
index e4044b4b5d..f064900103 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h
@@ -53,7 +53,7 @@ namespace EMStudio
         const char* GetCompileDate() const override     { return MCORE_DATE; }
         const char* GetName() const override            { return "Motion Sets"; }
         uint32 GetClassID() const override              { return MotionSetsWindowPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override     { return "Amazon"; }
+        const char* GetCreatorName() const override     { return "O3DE"; }
         float GetVersion() const override               { return 1.0f;  }
         bool GetIsClosable() const override             { return true;  }
         bool GetIsFloatable() const override            { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h
index aa5dcb207a..c82f1b491c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionWindow/MotionWindowPlugin.h
@@ -50,7 +50,7 @@ namespace EMStudio
         const char* GetCompileDate() const override     { return MCORE_DATE; }
         const char* GetName() const override            { return "Motions"; }
         uint32 GetClassID() const override              { return MotionWindowPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override     { return "Amazon"; }
+        const char* GetCreatorName() const override     { return "O3DE"; }
         float GetVersion() const override               { return 1.0f;  }
         bool GetIsClosable() const override             { return true;  }
         bool GetIsFloatable() const override            { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h
index 72cc5655f9..c99c311a3c 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeGroups/NodeGroupsPlugin.h
@@ -44,7 +44,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Node Groups"; }
         uint32 GetClassID() const override                  { return NodeGroupsPlugin::CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
index fa7ca5ede4..7a4af96cb6 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeWindowPlugin.h
@@ -47,7 +47,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Joint outliner"; }
         uint32 GetClassID() const override                  { return CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h
index c8c1f92d1c..09ede17f90 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/SceneManagerPlugin.h
@@ -75,7 +75,7 @@ namespace EMStudio
         const char* GetCompileDate() const override         { return MCORE_DATE; }
         const char* GetName() const override                { return "Actor Manager"; }
         uint32 GetClassID() const override                  { return CLASS_ID; }
-        const char* GetCreatorName() const override         { return "Amazon"; }
+        const char* GetCreatorName() const override         { return "O3DE"; }
         float GetVersion() const override                   { return 1.0f;  }
         bool GetIsClosable() const override                 { return true;  }
         bool GetIsFloatable() const override                { return true;  }
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp
index 3439708a8f..6845fadb53 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TimeViewPlugin.cpp
@@ -138,7 +138,7 @@ namespace EMStudio
     // get the creator name
     const char* TimeViewPlugin::GetCreatorName() const
     {
-        return "Amazon";
+        return "O3DE";
     }
 
 
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
index 999d1d5f77..089bee5043 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
@@ -1555,7 +1555,7 @@ void CUiAnimViewDialog::ReadMiscSettings()
 //////////////////////////////////////////////////////////////////////////
 void CUiAnimViewDialog::SaveLayouts()
 {
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("UiAnimView");
     QByteArray stateData = this->saveState();
     settings.setValue("layout", stateData);
@@ -1570,7 +1570,7 @@ void CUiAnimViewDialog::SaveLayouts()
 //////////////////////////////////////////////////////////////////////////
 void CUiAnimViewDialog::ReadLayouts()
 {
-    QSettings settings("Amazon", "O3DE");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("UiAnimView");
     if (settings.contains("layout"))
     {
diff --git a/Gems/LyShine/Code/Editor/EditorCommon.h b/Gems/LyShine/Code/Editor/EditorCommon.h
index c25be71964..4327755400 100644
--- a/Gems/LyShine/Code/Editor/EditorCommon.h
+++ b/Gems/LyShine/Code/Editor/EditorCommon.h
@@ -160,7 +160,7 @@ enum class FusibleCommand
 #include "ViewportWidget.h"
 
 // IMPORTANT: This is NOT the permanent location for these values.
-#define AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME "Amazon"
+#define AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME "O3DE"
 #define AZ_QCOREAPPLICATION_SETTINGS_APPLICATION_NAME "O3DE"
 
 // See: http://en.wikipedia.org/wiki/Internet_media_type#Prefix_x
diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h
index 5cb53a8a99..bbbc431f54 100644
--- a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h
+++ b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h
@@ -7,7 +7,7 @@
 #pragma once
 
 // IMPORTANT: This is NOT the permanent location for these values.
-#define SCRIPTCANVASEDITOR_AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME  "Amazon"
+#define SCRIPTCANVASEDITOR_AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME  "O3DE"
 #define SCRIPTCANVASEDITOR_NAME_SHORT   "ScriptCanvasEditor"
 
 namespace ScriptCanvasEditor
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
index 45737edef0..f665f0be7e 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
@@ -98,4 +98,4 @@ class WindowsWorkspaceManager(AbstractWorkspaceManager):
     def clear_settings(self):
         logger.debug("Build::setup_clear_registry")
         if sys.platform == "win32":
-            ly_test_tools.environment.reg_cleaner.clean_ly_keys(exception_list=r"SOFTWARE\Amazon\Lumberyard\Identity")
+            ly_test_tools.environment.reg_cleaner.clean_ly_keys(exception_list=r"SOFTWARE\O3DE\O3DE\Identity")
diff --git a/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py b/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py
index 1b05eaa130..f344ea1739 100755
--- a/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py
+++ b/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py
@@ -11,7 +11,7 @@ import winreg
 
 import ly_test_tools.environment.process_utils as process_utils
 
-CONST_LY_REG = r'SOFTWARE\Amazon\Lumberyard'
+CONST_LY_REG = r'SOFTWARE\O3DE\O3DE'
 AUTOMATION_EXCEPTION_LIST = [
     os.path.join(CONST_LY_REG, r"Identity"),
     os.path.join(CONST_LY_REG, r"Settings\DXInstalled"),
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
index 068aa3dbbd..0f0be73bc5 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
@@ -29,7 +29,7 @@ from ly_test_tools.o3de.ap_log_parser import APLogParser
 logger = logging.getLogger(__name__)
 
 # Asset Processor fast scan system setting key/subkey
-AP_FASTSCAN_KEY = r"Software\Amazon\O3DE Asset Processor\Options"
+AP_FASTSCAN_KEY = r"Software\O3DE\O3DE Asset Processor\Options"
 AP_FASTSCAN_SUBKEY = r"EnableZeroAnalysis"
 
 
diff --git a/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py b/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
index 207a04c322..bb10bfb99c 100755
--- a/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
+++ b/Tools/LyTestTools/tests/unit/test_manager_platforms_windows.py
@@ -102,4 +102,4 @@ class TestWindowsWorkspaceManager(object):
         windows_workspace_manager = ly_test_tools._internal.managers.platforms.windows.WindowsWorkspaceManager()
         windows_workspace_manager.clear_settings()
 
-        mock_clear_keys.assert_called_with(exception_list=r"SOFTWARE\Amazon\Lumberyard\Identity")
+        mock_clear_keys.assert_called_with(exception_list=r"SOFTWARE\O3DE\O3DE\Identity")