diff --git a/src/ATC/AIMgr.cxx b/src/ATC/AIMgr.cxx
index 93a878388..2c118e0e1 100644
--- a/src/ATC/AIMgr.cxx
+++ b/src/ATC/AIMgr.cxx
@@ -75,7 +75,7 @@ void FGAIMgr::init() {
 	
 	// Load up models at the start to avoid pausing later
 	// Hack alert - Hardwired paths!!
-	string planepath = "Aircraft/c172/Models/c172-dpm.ac";
+	string planepath = "Aircraft/c172r/Models/c172-dpm.ac";
 	bool _loadedDefaultOK = true;
 	try {
 		_defaultModel = sgLoad3DModel( globals->get_fg_root(),
diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index 734299dd6..47292bc32 100644
--- a/src/Aircraft/aircraft.cxx
+++ b/src/Aircraft/aircraft.cxx
@@ -159,7 +159,7 @@ fgLoadAircraft (const SGPropertyNode * arg)
     globals->restoreInitialState();
 
     fgSetString("/sim/aircraft", aircraft.c_str());
-    fgSetString("/sim/panel/path", "Aircraft/c172/Panels/c172-vfr-panel.xml");
+    fgSetString("/sim/panel/path", "Aircraft/c172p/Panels/c172-vfr-panel.xml");
 
     if ( aircraft.size() > 0 ) {
         SGPath aircraft_path(globals->get_fg_root());
@@ -183,7 +183,7 @@ fgLoadAircraft (const SGPropertyNode * arg)
     // Initialize the (new) 2D panel.
     //
     string panel_path = fgGetString("/sim/panel/path",
-                                    "Aircraft/c172/Panels/c172-vfr-panel.xml");
+                                    "Aircraft/c172p/Panels/c172-vfr-panel.xml");
 
     FGPanel *panel = fgReadPanel(panel_path);
     if (panel == 0) {