diff --git a/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java b/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
index 93728447..08e5f616 100644
--- a/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
+++ b/vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.oscim.theme.RenderThemeHandler;
+import org.oscim.theme.XmlThemeBuilder;
 import org.oscim.tiling.TileSource.OpenResult;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -40,7 +40,7 @@ public final class ValidRenderTheme implements ValidFileFilter {
 
 		try {
 			inputStream = new FileInputStream(file);
-			RenderThemeHandler renderThemeHandler = new RenderThemeHandler();
+			XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder();
 			XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
 			xmlReader.setContentHandler(renderThemeHandler);
 			xmlReader.parse(new InputSource(inputStream));
diff --git a/vtm/src/org/oscim/theme/ThemeLoader.java b/vtm/src/org/oscim/theme/ThemeLoader.java
index c49a9213..43543035 100644
--- a/vtm/src/org/oscim/theme/ThemeLoader.java
+++ b/vtm/src/org/oscim/theme/ThemeLoader.java
@@ -45,7 +45,7 @@ public class ThemeLoader {
 		InputStream inputStream = null;
 		try {
 			inputStream = theme.getRenderThemeAsStream();
-			IRenderTheme t = RenderThemeHandler.getRenderTheme(inputStream);
+			IRenderTheme t = XmlThemeBuilder.from(inputStream);
 
 			if (t != null)
 				t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f);
diff --git a/vtm/src/org/oscim/theme/RenderThemeHandler.java b/vtm/src/org/oscim/theme/XmlThemeBuilder.java
similarity index 98%
rename from vtm/src/org/oscim/theme/RenderThemeHandler.java
rename to vtm/src/org/oscim/theme/XmlThemeBuilder.java
index c78a3ecd..c3b59040 100644
--- a/vtm/src/org/oscim/theme/RenderThemeHandler.java
+++ b/vtm/src/org/oscim/theme/XmlThemeBuilder.java
@@ -52,8 +52,8 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
-public class RenderThemeHandler extends DefaultHandler {
-	static final Logger log = LoggerFactory.getLogger(RenderThemeHandler.class);
+public class XmlThemeBuilder extends DefaultHandler {
+	static final Logger log = LoggerFactory.getLogger(XmlThemeBuilder.class);
 
 	private static final int RENDER_THEME_VERSION = 1;
 
@@ -83,10 +83,10 @@ public class RenderThemeHandler extends DefaultHandler {
 	 * @throws IOException
 	 *             if an I/O error occurs while reading from the input stream.
 	 */
-	public static IRenderTheme getRenderTheme(InputStream inputStream)
+	public static IRenderTheme from(InputStream inputStream)
 	        throws SAXException, IOException {
 
-		RenderThemeHandler renderThemeHandler = new RenderThemeHandler();
+		XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder();
 
 		new XMLReaderAdapter().parse(renderThemeHandler, inputStream);
 
@@ -571,7 +571,7 @@ public class RenderThemeHandler extends DefaultHandler {
 			if ("img".equals(name)) {
 				img = value;
 			} else {
-				RenderThemeHandler.logUnknownAttribute(elementName, name, value, i);
+				XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
 			}
 		}
 		if (img == null)
@@ -600,7 +600,7 @@ public class RenderThemeHandler extends DefaultHandler {
 					             Integer.parseInt(pos[3]));
 				}
 			} else {
-				RenderThemeHandler.logUnknownAttribute(elementName, name, value, i);
+				XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
 			}
 		}
 		if (regionName == null || r == null)
@@ -683,7 +683,7 @@ public class RenderThemeHandler extends DefaultHandler {
 				baseTextSize = Float.parseFloat(value);
 
 			else
-				RenderThemeHandler.logUnknownAttribute(elementName, name, value, i);
+				XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
 
 		}
 
diff --git a/vtm/src/org/oscim/theme/rule/RuleBuilder.java b/vtm/src/org/oscim/theme/rule/RuleBuilder.java
index 03143849..6f80b9b8 100644
--- a/vtm/src/org/oscim/theme/rule/RuleBuilder.java
+++ b/vtm/src/org/oscim/theme/rule/RuleBuilder.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Stack;
 
 import org.oscim.theme.IRenderTheme.ThemeException;
-import org.oscim.theme.RenderThemeHandler;
+import org.oscim.theme.XmlThemeBuilder;
 import org.oscim.theme.styles.RenderStyle;
 import org.xml.sax.Attributes;
 
@@ -185,7 +185,7 @@ public class RuleBuilder {
 				if ("when-matched".equals(value))
 					selector |= SELECT_WHEN_MATCHED;
 			} else {
-				RenderThemeHandler.logUnknownAttribute(elementName, name, value, i);
+				XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
 			}
 		}