diff --git a/src/Viewer/WindowBuilder.cxx b/src/Viewer/WindowBuilder.cxx
index 789b7c4..a7ef972 100644
--- a/src/Viewer/WindowBuilder.cxx
+++ b/src/Viewer/WindowBuilder.cxx
@@ -275,7 +275,7 @@ GraphicsWindow* WindowBuilder::buildWindow(const SGPropertyNode* winNode, bool i
         traits->windowName = windowName;
         traitsSet = 1;
     } else if (traitsSet) {
-        traits->windowName = makeName("FlightGear", defaultCounter++);
+        traits->windowName = makeName("JIngweiHT", defaultCounter++);
     }
 
     setMacPoseAsStandaloneApp(traits);
@@ -320,7 +320,7 @@ GraphicsWindow* WindowBuilder::getDefaultWindow()
     GraphicsContext* gc = GraphicsContext::createGraphicsContext(traits);
     if (!gc) {
         flightgear::fatalMessageBoxThenExit("Unable to create window",
-                                            "FlightGear was unable to create a window supporting 3D rendering (OpenGL). "
+                                            "FGFS was unable to create a window supporting 3D rendering (OpenGL). "
                                             "This is normally due to outdated graphics drivers, please check if updates are available. ",
                                             "Depending on your OS and graphics chipset, updates might come from AMD, nVidia or Intel.");
         return nullptr; // unreachable anyway