diff --git a/core/Makefile b/core/Makefile
index 8bd5351..1aabf94 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -572,7 +572,7 @@
 
 # $(1): src directory
 # $(2): output file
-# $(3): label
+# $(3): mount point
 # $(4): ext variant (ext2, ext3, ext4)
 # $(5): size of the partition
 define build-userimage-ext-target
@@ -797,7 +797,7 @@
 define build-userdataimage-target
     $(call pretty,"Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)")
     @mkdir -p $(TARGET_OUT_DATA)
-    $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),userdata,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_USERDATAIMAGE_PARTITION_SIZE))
+    $(call build-userimage-ext-target,$(TARGET_OUT_DATA),$(INSTALLED_USERDATAIMAGE_TARGET),data,$(INTERNAL_USERIMAGES_EXT_VARIANT),$(BOARD_USERDATAIMAGE_PARTITION_SIZE))
     $(hide) $(call assert-max-image-size,$(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE),yaffs)
 endef
 
diff --git a/tools/releasetools/img_from_target_files b/tools/releasetools/img_from_target_files
index 871e295..f10af49 100755
--- a/tools/releasetools/img_from_target_files
+++ b/tools/releasetools/img_from_target_files
@@ -64,7 +64,7 @@
   if OPTIONS.info_dict["fstab"]["/data"].fs_type.startswith("ext"):
     build_command = ["mkuserimg.sh",
                      user_dir, img.name,
-                     OPTIONS.info_dict["fstab"]["/data"].fs_type, "userdata"]
+                     OPTIONS.info_dict["fstab"]["/data"].fs_type, "data"]
     if "userdata_size" in OPTIONS.info_dict:
       build_command.append(str(OPTIONS.info_dict["userdata_size"]))
   else: