diff --git a/base/fs/__init__.py b/base/fs/__init__.py
index eae0dd1..cd6c7a3 100644
--- a/base/fs/__init__.py
+++ b/base/fs/__init__.py
@@ -6,11 +6,11 @@ def load_volume(data):
 	from common.fs.virtualdiskimage import VirtualDiskImage
 	from common.fs.virtualmachinedisk import VirtualMachineDisk
 	from partitionmaps.gpt import GPTPartitionMap
-	from partitionmaps.mbr import MBRPartitionMap
+	from partitionmaps.msdos import MSDOSPartitionMap
 	from partitionmaps.none import NoPartitions
 	partition_maps = {'none': NoPartitions,
 	                  'gpt': GPTPartitionMap,
-	                  'mbr': MBRPartitionMap,
+	                  'msdos': MSDOSPartitionMap,
 	                  }
 	partition_map = partition_maps.get(data['partitions']['type'])(data['partitions'])
 	volume_backings = {'raw': LoopbackVolume,
diff --git a/base/fs/partitionmaps/mbr.py b/base/fs/partitionmaps/msdos.py
similarity index 67%
rename from base/fs/partitionmaps/mbr.py
rename to base/fs/partitionmaps/msdos.py
index d90cdbe..3416447 100644
--- a/base/fs/partitionmaps/mbr.py
+++ b/base/fs/partitionmaps/msdos.py
@@ -1,10 +1,10 @@
 from abstract import AbstractPartitionMap
-from ..partitions.mbr import MBRPartition
-from ..partitions.mbr_swap import MBRSwapPartition
+from ..partitions.msdos import MSDOSPartition
+from ..partitions.msdos_swap import MSDOSSwapPartition
 from common.tools import log_check_call
 
 
-class MBRPartitionMap(AbstractPartitionMap):
+class MSDOSPartitionMap(AbstractPartitionMap):
 
 	def __init__(self, data):
 		self.partitions = []
@@ -12,15 +12,15 @@ class MBRPartitionMap(AbstractPartitionMap):
 		def last_partition():
 			return self.partitions[-1] if len(self.partitions) > 0 else None
 		if 'boot' in data:
-			self.boot = MBRPartition(data['boot']['size'], data['boot']['filesystem'], None)
+			self.boot = MSDOSPartition(data['boot']['size'], data['boot']['filesystem'], None)
 			self.partitions.append(self.boot)
 		if 'swap' in data:
-			self.swap = MBRSwapPartition(data['swap']['size'], last_partition())
+			self.swap = MSDOSSwapPartition(data['swap']['size'], last_partition())
 			self.partitions.append(self.swap)
-		self.root = MBRPartition(data['root']['size'], data['root']['filesystem'], last_partition())
+		self.root = MSDOSPartition(data['root']['size'], data['root']['filesystem'], last_partition())
 		self.partitions.append(self.root)
 
-		super(MBRPartitionMap, self).__init__()
+		super(MSDOSPartitionMap, self).__init__()
 
 	def get_total_size(self):
 		return sum(p.size for p in self.partitions) + 1  # Post-MBR gap for embedding grub
diff --git a/base/fs/partitions/mbr.py b/base/fs/partitions/msdos.py
similarity index 94%
rename from base/fs/partitions/mbr.py
rename to base/fs/partitions/msdos.py
index d10c2d8..19dc46d 100644
--- a/base/fs/partitions/mbr.py
+++ b/base/fs/partitions/msdos.py
@@ -2,7 +2,7 @@ from common.tools import log_check_call
 from base import BasePartition
 
 
-class MBRPartition(BasePartition):
+class MSDOSPartition(BasePartition):
 
 	def get_start(self):
 		if self.previous is None:
diff --git a/base/fs/partitions/mbr_swap.py b/base/fs/partitions/msdos_swap.py
similarity index 53%
rename from base/fs/partitions/mbr_swap.py
rename to base/fs/partitions/msdos_swap.py
index 4e62e4b..4b1d1dc 100644
--- a/base/fs/partitions/mbr_swap.py
+++ b/base/fs/partitions/msdos_swap.py
@@ -1,11 +1,11 @@
 from common.tools import log_check_call
-from mbr import MBRPartition
+from msdos import MSDOSPartition
 
 
-class MBRSwapPartition(MBRPartition):
+class MSDOSSwapPartition(MSDOSPartition):
 
 	def __init__(self, size, previous):
-		super(MBRSwapPartition, self).__init__(size, 'swap', previous)
+		super(MSDOSSwapPartition, self).__init__(size, 'swap', previous)
 
 	def _before_format(self, e):
 		log_check_call(['/sbin/mkswap', self.device_path])
diff --git a/base/manifest-schema.json b/base/manifest-schema.json
index cb20216..7e35893 100644
--- a/base/manifest-schema.json
+++ b/base/manifest-schema.json
@@ -117,7 +117,7 @@
 		"partition_table": {
 			"type": "object",
 			"properties": {
-				"type": { "enum": ["mbr", "gpt"] },
+				"type": { "enum": ["msdos", "gpt"] },
 				"boot": { "$ref": "#/definitions/partition" },
 				"root": { "$ref": "#/definitions/partition" },
 				"swap": {
diff --git a/manifests/ec2-ebs-partitioned.manifest.json b/manifests/ec2-ebs-partitioned.manifest.json
index 3101960..423f75d 100644
--- a/manifests/ec2-ebs-partitioned.manifest.json
+++ b/manifests/ec2-ebs-partitioned.manifest.json
@@ -27,7 +27,7 @@
 	"volume": {
 		"backing": "ebs",
 		"partitions": {
-			"type": "mbr",
+			"type": "msdos",
 			"root": {
 				"size":       1023,
 				"filesystem": "ext4"
diff --git a/manifests/virtualbox-vagrant.manifest.json b/manifests/virtualbox-vagrant.manifest.json
index 7a07431..a4a7476 100644
--- a/manifests/virtualbox-vagrant.manifest.json
+++ b/manifests/virtualbox-vagrant.manifest.json
@@ -20,7 +20,7 @@
 	"volume": {
 		"backing": "vmdk",
 		"partitions": {
-			"type": "mbr",
+			"type": "msdos",
 			"boot": {
 				"size":       64,
 				"filesystem": "ext2"
diff --git a/manifests/virtualbox.manifest.json b/manifests/virtualbox.manifest.json
index 951b626..335547c 100644
--- a/manifests/virtualbox.manifest.json
+++ b/manifests/virtualbox.manifest.json
@@ -20,7 +20,7 @@
 	"volume": {
 		"backing": "vdi",
 		"partitions": {
-			"type": "mbr",
+			"type": "msdos",
 			"boot": {
 				"size":       32,
 				"filesystem": "ext2"
diff --git a/providers/ec2/__init__.py b/providers/ec2/__init__.py
index 63795f0..f706c12 100644
--- a/providers/ec2/__init__.py
+++ b/providers/ec2/__init__.py
@@ -31,7 +31,7 @@ def validate_manifest(data, validator, error):
 	validator(data, os.path.join(os.path.dirname(__file__), 'manifest-schema.json'))
 
 	if data['volume']['backing'] == 'ebs':
-		volume_size = 1 if data['volume']['partitions']['type'] == 'mbr' else 0
+		volume_size = 1 if data['volume']['partitions']['type'] == 'msdos' else 0
 		for key, partition in data['volume']['partitions'].iteritems():
 			if key != 'type':
 				volume_size += partition['size']
diff --git a/providers/ec2/manifest-schema.json b/providers/ec2/manifest-schema.json
index 30666a5..d657991 100644
--- a/providers/ec2/manifest-schema.json
+++ b/providers/ec2/manifest-schema.json
@@ -30,7 +30,7 @@
 				"partitions": {
 					"type": "object",
 					"properties": {
-						"type": { "enum": ["none", "mbr"] }
+						"type": { "enum": ["none", "msdos"] }
 					}
 				}
 			},
diff --git a/providers/virtualbox/manifest-schema.json b/providers/virtualbox/manifest-schema.json
index d1b0d4b..24c3923 100644
--- a/providers/virtualbox/manifest-schema.json
+++ b/providers/virtualbox/manifest-schema.json
@@ -30,7 +30,7 @@
 				"partitions": {
 					"type": "object",
 					"properties": {
-						"type": { "enum": ["none", "mbr"] }
+						"type": { "enum": ["none", "msdos"] }
 					}
 				}
 			},