diff --git a/Code/Sandbox/Editor/EditorViewportWidget.cpp b/Code/Sandbox/Editor/EditorViewportWidget.cpp
index c57347a809..216854eddb 100644
--- a/Code/Sandbox/Editor/EditorViewportWidget.cpp
+++ b/Code/Sandbox/Editor/EditorViewportWidget.cpp
@@ -2839,7 +2839,7 @@ void EditorViewportWidget::RestoreViewportAfterGameMode()
     if (restoreOnExitGameModePopupDisabledRegValue.isNull())
     {
         // No, ask them now
-        QMessageBox messageBox(QMessageBox::Question, "Lumberyard", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
+        QMessageBox messageBox(QMessageBox::Question, "O3DE", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
         messageBox.setDefaultButton(QMessageBox::Yes);
 
         QCheckBox* checkBox = new QCheckBox(QStringLiteral("Do not show this message again"));
diff --git a/Code/Sandbox/Editor/RenderViewport.cpp b/Code/Sandbox/Editor/RenderViewport.cpp
index c8aafb1151..88d24a068b 100644
--- a/Code/Sandbox/Editor/RenderViewport.cpp
+++ b/Code/Sandbox/Editor/RenderViewport.cpp
@@ -4094,7 +4094,7 @@ void CRenderViewport::RestoreViewportAfterGameMode()
     if (restoreOnExitGameModePopupDisabledRegValue.isNull())
     {
         // No, ask them now
-        QMessageBox messageBox(QMessageBox::Question, "Lumberyard", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
+        QMessageBox messageBox(QMessageBox::Question, "O3DE", text, QMessageBox::StandardButtons(QMessageBox::No | QMessageBox::Yes), this);
         messageBox.setDefaultButton(QMessageBox::Yes);
 
         QCheckBox* checkBox = new QCheckBox(QStringLiteral("Do not show this message again"));
diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp
index b7ccd6ce40..2c11ca60a8 100644
--- a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp
+++ b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp
@@ -76,7 +76,7 @@ QString CFFMPEGPlugin::GetFFMPEGExectablePath()
     // see what can be found!
     QString ffmpegExectablePath;
 
-    QSettings settings("Amazon", "Lumberyard");
+    QSettings settings("O3DE", "O3DE");
     settings.beginGroup("Settings");
     ffmpegExectablePath = settings.value("FFMPEG_PLUGIN").toString();