diff --git a/Lib/fontTools/ttLib/tables/_s_b_i_x.py b/Lib/fontTools/ttLib/tables/_s_b_i_x.py
index 0758ac188..c4e3d30d3 100644
--- a/Lib/fontTools/ttLib/tables/_s_b_i_x.py
+++ b/Lib/fontTools/ttLib/tables/_s_b_i_x.py
@@ -86,16 +86,16 @@ class table__s_b_i_x(DefaultTable.DefaultTable):
 				offsetEntry)
 			self.bitmapSetOffsets.append(offsetEntry.offset)
 
-		# decompile BitmapSets
+		# decompile Strikes
 		for i in range(self.numStrikes-1, -1, -1):
-			myBitmapSet = BitmapSet(rawdata=data[self.bitmapSetOffsets[i]:])
+			myBitmapSet = Strike(rawdata=data[self.bitmapSetOffsets[i]:])
 			data = data[:self.bitmapSetOffsets[i]]
 			myBitmapSet.decompile(ttFont)
-			#print "  BitmapSet length: %xh" % len(bitmapSetData)
+			#print "  Strike length: %xh" % len(bitmapSetData)
 			#print "Number of Bitmaps:", myBitmapSet.numBitmaps
 			if myBitmapSet.size in self.bitmapSets:
 				from fontTools import ttLib
-				raise ttLib.TTLibError("Pixel 'size' must be unique for each BitmapSet")
+				raise ttLib.TTLibError("Pixel 'size' must be unique for each Strike")
 			self.bitmapSets[myBitmapSet.size] = myBitmapSet
 
 		# after the bitmaps have been extracted, we don't need the offsets anymore
@@ -131,8 +131,8 @@ class table__s_b_i_x(DefaultTable.DefaultTable):
 	def fromXML(self, name, attrs, content, ttFont):
 		if name in ["version", "flags"]:
 			setattr(self, name, int(attrs["value"]))
-		elif name == "bitmapSet":
-			myBitmapSet = BitmapSet()
+		elif name == "strike":
+			myBitmapSet = Strike()
 			for element in content:
 				if isinstance(element, tuple):
 					name, attrs, content = element
diff --git a/Lib/fontTools/ttLib/tables/sbixStrike.py b/Lib/fontTools/ttLib/tables/sbixStrike.py
index ceb6077b6..9a4ab76e8 100644
--- a/Lib/fontTools/ttLib/tables/sbixStrike.py
+++ b/Lib/fontTools/ttLib/tables/sbixStrike.py
@@ -20,7 +20,7 @@ sbixBitmapSetHeaderFormatSize = sstruct.calcsize(sbixBitmapSetHeaderFormat)
 sbixBitmapOffsetEntryFormatSize = sstruct.calcsize(sbixBitmapOffsetEntryFormat)
 
 
-class BitmapSet(object):
+class Strike(object):
 	def __init__(self, rawdata=None, size=0, resolution=72):
 		self.data = rawdata
 		self.size = size
@@ -33,10 +33,10 @@ class BitmapSet(object):
 			raise ttLib.TTLibError
 		if len(self.data) < sbixBitmapSetHeaderFormatSize:
 			from fontTools import ttLib
-			raise(ttLib.TTLibError, "BitmapSet header too short: Expected %x, got %x.") \
+			raise(ttLib.TTLibError, "Strike header too short: Expected %x, got %x.") \
 				% (sbixBitmapSetHeaderFormatSize, len(self.data))
 
-		# read BitmapSet header from raw data
+		# read Strike header from raw data
 		sstruct.unpack(sbixBitmapSetHeaderFormat, self.data[:sbixBitmapSetHeaderFormatSize], self)
 
 		# calculate number of bitmaps
@@ -92,7 +92,7 @@ class BitmapSet(object):
 		self.data += self.bitmapOffsets + self.bitmapData
 
 	def toXML(self, xmlWriter, ttFont):
-		xmlWriter.begintag("bitmapSet")
+		xmlWriter.begintag("strike")
 		xmlWriter.newline()
 		xmlWriter.simpletag("size", value=self.size)
 		xmlWriter.newline()
@@ -103,7 +103,7 @@ class BitmapSet(object):
 			if glyphOrder[i] in self.bitmaps:
 				self.bitmaps[glyphOrder[i]].toXML(xmlWriter, ttFont)
 				# TODO: what if there are more bitmaps than glyphs?
-		xmlWriter.endtag("bitmapSet")
+		xmlWriter.endtag("strike")
 		xmlWriter.newline()
 
 	def fromXML(self, name, attrs, content, ttFont):