diff --git a/Makefile b/Makefile
index a28f0ec2..3a93eab3 100644
--- a/Makefile
+++ b/Makefile
@@ -171,19 +171,16 @@ __truck:
 		drc off; \
 		crashbackups stop; \
 		addpath hexdigits; \
-		addpath $(CARAVEL_ROOT)/mag; \
+		addpath $(MCW_ROOT)/mag; \
 		addpath $(UPRJ_ROOT)/mag; \
 		load user_analog_project_wrapper; \
 		property LEFview true; \
 		property GDS_FILE $(UPRJ_ROOT)/gds/user_analog_project_wrapper.gds; \
 		property GDS_START 0; \
-		load mgmt_core_wrapper; \
-		property LEFview true; \
-		property GDS_FILE $(MCW_ROOT)/gds/mgmt_core_wrapper.gds; \
-		property GDS_START 0; \
 		load $(UPRJ_ROOT)/mag/user_id_programming; \
 		load $(UPRJ_ROOT)/mag/user_id_textblock; \
-		load ../maglef/simple_por; \
+		load $(CARAVEL_ROOT)/maglef/simple_por; \
+		load $(UPRJ_ROOT)/mag/caravan_core -dereference; \
 		load $(UPRJ_ROOT)/mag/caravan -dereference; \
 		select top cell; \
 		expand; \
diff --git a/scripts/gen_gpio_defaults.py b/scripts/gen_gpio_defaults.py
index abec820e..5f045ebf 100755
--- a/scripts/gen_gpio_defaults.py
+++ b/scripts/gen_gpio_defaults.py
@@ -420,7 +420,7 @@ if __name__ == '__main__':
 
     if testmode:
         print('Test only:  Caravan layout:')
-    with open(caravel_path + '/mag/caravan.mag', 'r') as ifile:
+    with open(caravel_path + '/mag/caravan_core.mag', 'r') as ifile:
         maglines = ifile.read().splitlines()
         outlines = []
         for magline in maglines:
@@ -450,7 +450,7 @@ if __name__ == '__main__':
                 outlines.append(magline)
 
     if not testmode:
-        with open(magpath + '/caravan.mag', 'w') as ofile:
+        with open(magpath + '/caravan_core.mag', 'w') as ofile:
             for outline in outlines:
                 print(outline, file=ofile)