diff --git a/ansible/tsg_7400_deploy.yml b/ansible/tsg_7400_deploy.yml
index 26dfedb8..7b518b82 100644
--- a/ansible/tsg_7400_deploy.yml
+++ b/ansible/tsg_7400_deploy.yml
@@ -1,4 +1,4 @@
-- hosts: tsg_7400_chroot_mcn0
+- hosts: 7400-MCN0-P01R01
   remote_user: root
   vars_files:
     - install_config/group_vars/tsg_7400_docker.yml
@@ -7,7 +7,7 @@
     - {role: tsg-os-provision, tags: tsg-os-provision}
     - {role: system-init-7400-mcn0, tags: system-init-7400-mcn0}
 
-- hosts: tsg_7400_chroot_mcn1
+- hosts: 7400-MCN1-P01R01
   remote_user: root
   vars_files:
     - install_config/group_vars/tsg_7400_docker.yml
@@ -16,7 +16,7 @@
     - {role: tsg-os-provision, tags: tsg-os-provision}
     - {role: system-init-7400-mcn1, tags: system-init-7400-mcn1}
 
-- hosts: tsg_7400_chroot_mcn2
+- hosts: 7400-MCN2-P01R01
   remote_user: root
   vars_files:
     - install_config/group_vars/tsg_7400_docker.yml
@@ -25,7 +25,7 @@
     - {role: tsg-os-provision, tags: tsg-os-provision}
     - {role: system-init-7400-mcn2, tags: system-init-7400-mcn2}
 
-- hosts: tsg_7400_chroot_mcn3
+- hosts: 7400-MCN3-P01R01
   remote_user: root
   vars_files:
     - install_config/group_vars/tsg_7400_docker.yml
diff --git a/make/Makefile.7400MCN0P01R01 b/make/Makefile.7400MCN0P01R01
index fec9b6c3..151a719f 100644
--- a/make/Makefile.7400MCN0P01R01
+++ b/make/Makefile.7400MCN0P01R01
@@ -1,6 +1,6 @@
 
-PROFILE_ID 				:= 7400-MCN-P01R01
-SUPPORTED_MACHINE_ID 	:= 7400-MCN-P01R01
+PROFILE_ID 				:= 7400-MCN0-P01R01
+SUPPORTED_MACHINE_ID 	:= 7400-MCN0-P01R01
 KERNEL_ARGS 			:= console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
 GRUB_SERIAL_COMMAND 	:=
 SIZE_PART_SYSROOT		:= 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-stage-one-7400-mcn0 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
+	$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
diff --git a/make/Makefile.7400MCN1P01R01 b/make/Makefile.7400MCN1P01R01
index 06ca642b..1caa75c1 100644
--- a/make/Makefile.7400MCN1P01R01
+++ b/make/Makefile.7400MCN1P01R01
@@ -1,6 +1,6 @@
 
-PROFILE_ID 				:= 7400-MCN-P01R01
-SUPPORTED_MACHINE_ID 	:= 7400-MCN-P01R01
+PROFILE_ID 				:= 7400-MCN1-P01R01
+SUPPORTED_MACHINE_ID 	:= 7400-MCN1-P01R01
 KERNEL_ARGS 			:= console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
 GRUB_SERIAL_COMMAND 	:=
 SIZE_PART_SYSROOT		:= 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-stage-one-7400-mcn1 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
+	$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
diff --git a/make/Makefile.7400MCN2P01R01 b/make/Makefile.7400MCN2P01R01
index cebfcd2f..170c0e32 100644
--- a/make/Makefile.7400MCN2P01R01
+++ b/make/Makefile.7400MCN2P01R01
@@ -1,6 +1,6 @@
 
-PROFILE_ID 				:= 7400-MCN-P01R01
-SUPPORTED_MACHINE_ID 	:= 7400-MCN-P01R01
+PROFILE_ID 				:= 7400-MCN2-P01R01
+SUPPORTED_MACHINE_ID 	:= 7400-MCN2-P01R01
 KERNEL_ARGS 			:= console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
 GRUB_SERIAL_COMMAND 	:=
 SIZE_PART_SYSROOT		:= 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-stage-one-7400-mcn2 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
+	$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
diff --git a/make/Makefile.7400MCN3P01R01 b/make/Makefile.7400MCN3P01R01
index 727f6b1b..b8b36c44 100644
--- a/make/Makefile.7400MCN3P01R01
+++ b/make/Makefile.7400MCN3P01R01
@@ -1,6 +1,6 @@
 
-PROFILE_ID 				:= 7400-MCN-P01R01
-SUPPORTED_MACHINE_ID 	:= 7400-MCN-P01R01
+PROFILE_ID 				:= 7400-MCN3-P01R01
+SUPPORTED_MACHINE_ID 	:= 7400-MCN3-P01R01
 KERNEL_ARGS 			:= console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
 GRUB_SERIAL_COMMAND 	:=
 SIZE_PART_SYSROOT		:= 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
 	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
 	cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
 	cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
-	$(TOOLSDIR)/ansible-stage-one-7400-mcn3 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
+	$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
 	cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
 
 sysroot-cleanup:
diff --git a/tools/ansible-stage-one-7400-mcn0 b/tools/ansible-stage-one-7400
similarity index 84%
rename from tools/ansible-stage-one-7400-mcn0
rename to tools/ansible-stage-one-7400
index ce53e318..5fdd8d71 100755
--- a/tools/ansible-stage-one-7400-mcn0
+++ b/tools/ansible-stage-one-7400
@@ -8,7 +8,7 @@ YUM_CONF_PATH=$4
 echo "-----------------------------  Ansible Stage 1  ----------------------------"
 echo "$PROFILE_ID"
 
-echo "[tsg_7400_chroot_mcn0]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
+echo "[$PROFILE_ID]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
 echo "$TARGET_SYSROOT_DIR  ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
 
 ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"
diff --git a/tools/ansible-stage-one-7400-mcn1 b/tools/ansible-stage-one-7400-mcn1
deleted file mode 100755
index ce53e318..00000000
--- a/tools/ansible-stage-one-7400-mcn1
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-PROFILE_ID=$1
-PROJECTDIR=$2
-TARGET_SYSROOT_DIR=$3
-YUM_CONF_PATH=$4
-
-echo "-----------------------------  Ansible Stage 1  ----------------------------"
-echo "$PROFILE_ID"
-
-echo "[tsg_7400_chroot_mcn0]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
-echo "$TARGET_SYSROOT_DIR  ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
-
-ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"
diff --git a/tools/ansible-stage-one-7400-mcn2 b/tools/ansible-stage-one-7400-mcn2
deleted file mode 100755
index e401b7a2..00000000
--- a/tools/ansible-stage-one-7400-mcn2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-PROFILE_ID=$1
-PROJECTDIR=$2
-TARGET_SYSROOT_DIR=$3
-YUM_CONF_PATH=$4
-
-echo "-----------------------------  Ansible Stage 1  ----------------------------"
-echo "$PROFILE_ID"
-
-echo "[tsg_7400_chroot_mcn2]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
-echo "$TARGET_SYSROOT_DIR  ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
-
-ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"
diff --git a/tools/ansible-stage-one-7400-mcn3 b/tools/ansible-stage-one-7400-mcn3
deleted file mode 100755
index 84a84c14..00000000
--- a/tools/ansible-stage-one-7400-mcn3
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-PROFILE_ID=$1
-PROJECTDIR=$2
-TARGET_SYSROOT_DIR=$3
-YUM_CONF_PATH=$4
-
-echo "-----------------------------  Ansible Stage 1  ----------------------------"
-echo "$PROFILE_ID"
-
-echo "[tsg_7400_chroot_mcn3]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
-echo "$TARGET_SYSROOT_DIR  ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
-
-ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"