diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 5872ca5..1d70267 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -18,7 +18,7 @@
 # Common BoardConfig for all supported architectures.
 #
 
-TARGET_BOOTLOADER_BOARD_NAME := vsoc
+TARGET_BOOTLOADER_BOARD_NAME := cutf
 
 # Build a separate vendor.img partition
 BOARD_USES_VENDORIMAGE := true
diff --git a/shared/config/init.cutf_cvm.rc b/shared/config/init.cutf_cvm.rc
new file mode 100644
index 0000000..3596d0a
--- /dev/null
+++ b/shared/config/init.cutf_cvm.rc
@@ -0,0 +1,7 @@
+# This file should contain entries specific to crosvm only, for common entries
+# use common file instead.
+import /vendor/etc/init/hw/init.common.rc
+
+# TODO add crosvm specific stuff here
+# logcat and kernel logs on vsockets instead of serial port would be good
+# examples
\ No newline at end of file
diff --git a/shared/config/init.vsoc.rc b/shared/config/init.cutf_ivsh.rc
similarity index 100%
rename from shared/config/init.vsoc.rc
rename to shared/config/init.cutf_ivsh.rc
diff --git a/shared/config/init.recovery.cutf_cvm.rc b/shared/config/init.recovery.cutf_cvm.rc
new file mode 100644
index 0000000..0da79f0
--- /dev/null
+++ b/shared/config/init.recovery.cutf_cvm.rc
@@ -0,0 +1,3 @@
+# This file should contain entries specific to crosvm only, for common entries
+# use common file instead.
+import /init.recovery.common.rc
diff --git a/shared/config/init.recovery.vsoc.rc b/shared/config/init.recovery.cutf_ivsh.rc
similarity index 100%
rename from shared/config/init.recovery.vsoc.rc
rename to shared/config/init.recovery.cutf_ivsh.rc
diff --git a/shared/config/init.recovery.virtio.rc b/shared/config/init.recovery.virtio.rc
deleted file mode 100644
index 298baf5..0000000
--- a/shared/config/init.recovery.virtio.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file should contain entries specific to the virtio hardware only, for
-# common entries use common file instead.
-import /init.recovery.common.rc
diff --git a/shared/config/init.virtio.rc b/shared/config/init.virtio.rc
deleted file mode 100644
index 8eb4a34..0000000
--- a/shared/config/init.virtio.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file should contain entries specific to the virtio hardware only, for
-# common entries use common file instead.
-import /vendor/etc/init/hw/init.common.rc
-
-# TODO add virtio specific stuff here
-# logcat and kernel logs on vsockets instead of serial port would be good
-# examples
\ No newline at end of file
diff --git a/shared/device.mk b/shared/device.mk
index 80ab1f2..cd80a0e 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -133,8 +133,8 @@
     device/google/cuttlefish/shared/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     device/google/cuttlefish/shared/config/camera_v3.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/camera.json \
     device/google/cuttlefish/shared/config/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.common.rc \
-    device/google/cuttlefish/shared/config/init.vsoc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.vsoc.rc \
-    device/google/cuttlefish/shared/config/init.virtio.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.virtio.rc \
+    device/google/cuttlefish/shared/config/init.cutf_ivsh.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.cutf_ivsh.rc \
+    device/google/cuttlefish/shared/config/init.cutf_cvm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.cutf_cvm.rc \
     device/google/cuttlefish/shared/config/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
     device/google/cuttlefish/shared/config/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
     device/google/cuttlefish/shared/config/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
@@ -178,15 +178,15 @@
 #
 ifeq ($(TARGET_BUILD_SYSTEM_ROOT_IMAGE),true)
 PRODUCT_COPY_FILES += \
-    device/google/cuttlefish/shared/config/fstab.dtb:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.vsoc \
-    device/google/cuttlefish/shared/config/fstab.dtb:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.virtio \
+    device/google/cuttlefish/shared/config/fstab.dtb:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.cutf_ivsh \
+    device/google/cuttlefish/shared/config/fstab.dtb:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.cutf_cvm \
 
 else
 PRODUCT_COPY_FILES += \
-    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_RAMDISK)/fstab.vsoc \
-    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.vsoc \
-    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_RAMDISK)/fstab.virtio \
-    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.virtio \
+    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_RAMDISK)/fstab.cutf_ivsh \
+    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.cutf_ivsh \
+    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_RAMDISK)/fstab.cutf_cvm \
+    device/google/cuttlefish/shared/config/fstab.initrd:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.cutf_cvm \
 
 endif
 
@@ -195,7 +195,7 @@
 # USB Specific
 #
 PRODUCT_COPY_FILES += \
-    device/google/cuttlefish/shared/config/init.hardware.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vsoc.usb.rc
+    device/google/cuttlefish/shared/config/init.hardware.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.cutf_ivsh.usb.rc
 
 # Packages for HAL implementations
 
@@ -204,7 +204,7 @@
 #
 PRODUCT_PACKAGES += \
     hwcomposer.drm \
-    hwcomposer.vsoc \
+    hwcomposer.cutf_ivsh \
     hwcomposer-stats \
     android.hardware.graphics.composer@2.1-impl \
     android.hardware.graphics.composer@2.1-service
@@ -214,7 +214,7 @@
 #
 PRODUCT_PACKAGES += \
     gralloc.minigbm \
-    gralloc.vsoc \
+    gralloc.cutf \
     android.hardware.graphics.mapper@2.0-impl \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service
@@ -230,7 +230,7 @@
 # Audio HAL
 #
 PRODUCT_PACKAGES += \
-    audio.primary.vsoc \
+    audio.primary.cutf_ivsh \
     android.hardware.audio@4.0-impl \
     android.hardware.audio.effect@4.0-impl \
     android.hardware.audio@2.0-service
@@ -252,8 +252,8 @@
 # Camera
 #
 PRODUCT_PACKAGES += \
-    camera.vsoc \
-    camera.vsoc.jpeg \
+    camera.cutf \
+    camera.cutf.jpeg \
     camera.device@3.2-impl \
     android.hardware.camera.provider@2.4-impl \
     android.hardware.camera.provider@2.4-service
@@ -262,7 +262,7 @@
 # Gatekeeper
 #
 PRODUCT_PACKAGES += \
-    gatekeeper.vsoc \
+    gatekeeper.cutf \
     android.hardware.gatekeeper@1.0-impl \
     android.hardware.gatekeeper@1.0-service
 
@@ -270,7 +270,7 @@
 # GPS
 #
 PRODUCT_PACKAGES += \
-    gps.vsoc \
+    gps.cutf \
     android.hardware.gnss@1.0-impl \
     android.hardware.gnss@1.0-service
 
@@ -286,7 +286,7 @@
 # Sensors
 #
 PRODUCT_PACKAGES += \
-    sensors.vsoc \
+    sensors.cutf \
     android.hardware.sensors@1.0-impl \
     android.hardware.sensors@1.0-service
 
@@ -294,7 +294,7 @@
 # Lights
 #
 PRODUCT_PACKAGES += \
-    lights.vsoc \
+    lights.cutf \
     android.hardware.light@2.0-impl \
     android.hardware.light@2.0-service
 
@@ -309,7 +309,7 @@
 # Power HAL
 #
 PRODUCT_PACKAGES += \
-    power.vsoc \
+    power.cutf \
     android.hardware.power@1.0-impl \
     android.hardware.power@1.0-service
 
@@ -350,7 +350,7 @@
 
 PRODUCT_COPY_FILES += \
     device/google/cuttlefish/shared/config/init.recovery.common.rc:recovery/root/init.recovery.common.rc \
-    device/google/cuttlefish/shared/config/init.recovery.vsoc.rc:recovery/root/init.recovery.vsoc.rc \
-    device/google/cuttlefish/shared/config/init.recovery.virtio.rc:recovery/root/init.recovery.virtio.rc \
+    device/google/cuttlefish/shared/config/init.recovery.cutf_ivsh.rc:recovery/root/init.recovery.cutf_ivsh.rc \
+    device/google/cuttlefish/shared/config/init.recovery.cutf_cvm.rc:recovery/root/init.recovery.cutf_cvm.rc \
 
 endif