diff --git a/Makefile b/Makefile
index 06ecd46..b8c615a 100644
--- a/Makefile
+++ b/Makefile
@@ -344,8 +344,8 @@
 mcord-spirent-test: $(M)/setup-automation
 	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_LOCAL) $(PI)/mcord-spirent-test-playbook.yml" $(LOGCMD)
 
-mcord-ng4t-test: $(M)/setup-automation
-	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_LOCAL) $(PI)/mcord-ng4t-test-playbook.yml" $(LOGCMD)
+mcord-ng40-test: $(M)/setup-automation
+	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_LOCAL) $(PI)/mcord-ng40-test-playbook.yml" $(LOGCMD)
 
 fabric-pingtest: $(M)/refresh-fabric
 	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) $(PI)/cord-fabric-pingtest.yml" $(LOGCMD)
diff --git a/podconfig/mcord-ng4t-mock.yml b/podconfig/mcord-ng40-mock.yml
similarity index 96%
rename from podconfig/mcord-ng4t-mock.yml
rename to podconfig/mcord-ng40-mock.yml
index 008989e..ebe8bf0 100644
--- a/podconfig/mcord-ng4t-mock.yml
+++ b/podconfig/mcord-ng40-mock.yml
@@ -19,5 +19,5 @@
 # Creates a single-node mock M-CORD pod
 
 cord_scenario: mock
-cord_profile: mcord-ng4t
+cord_profile: mcord-ng40
 
diff --git a/podconfig/mcord-ng4t-single.yml b/podconfig/mcord-ng40-single.yml
similarity index 96%
rename from podconfig/mcord-ng4t-single.yml
rename to podconfig/mcord-ng40-single.yml
index ce37094..cec8727 100644
--- a/podconfig/mcord-ng4t-single.yml
+++ b/podconfig/mcord-ng40-single.yml
@@ -19,5 +19,5 @@
 # Creates a single-node mock M-CORD pod w/synchronizers
 
 cord_scenario: single
-cord_profile: mcord-ng4t
+cord_profile: mcord-ng40
 
diff --git a/podconfig/mcord-ng4t-virtual.yml b/podconfig/mcord-ng40-virtual.yml
similarity index 95%
rename from podconfig/mcord-ng4t-virtual.yml
rename to podconfig/mcord-ng40-virtual.yml
index 6795204..20b02c3 100644
--- a/podconfig/mcord-ng4t-virtual.yml
+++ b/podconfig/mcord-ng40-virtual.yml
@@ -18,7 +18,9 @@
 # Creates a virtual multi-node M-CORD pod, aka "mcord-in-a-box"
 
 cord_scenario: cord
-cord_profile: mcord-ng4t
+cord_profile: mcord-ng40
+
+compute_vm_mem: 32768
 
 vagrant_up_prereqs:
   - prereqs-check