diff --git a/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java b/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java
index fd45eec4..d28876de 100644
--- a/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java
+++ b/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java
@@ -45,7 +45,7 @@ public class ExternalRenderThemeTest extends GdxMapApp {
 
         try {
             IRenderTheme theme = ThemeLoader.load(name);
-            mapLayer.setRenderTheme(theme);
+            mapLayer.setTheme(theme);
             MapRenderer.setBackgroundColor(theme.getMapBackground());
         } catch (ThemeException e) {
             e.printStackTrace();
@@ -80,7 +80,7 @@ public class ExternalRenderThemeTest extends GdxMapApp {
             // IRenderTheme theme =
             // ThemeLoader.load("themes/elevate/theme.xml");
             // IRenderTheme theme = ThemeLoader.load("themes/vmap/theme.xml");
-            l.setRenderTheme(theme);
+            l.setTheme(theme);
             MapRenderer.setBackgroundColor(theme.getMapBackground());
         } catch (ThemeException e) {
             e.printStackTrace();
diff --git a/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java b/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
index 7e40462a..2bf05db8 100644
--- a/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
+++ b/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
@@ -39,7 +39,7 @@ public class ThemeTest extends GdxMapApp {
 
         VectorTileLayer l = mMap.setBaseMap(ts);
 
-        l.setRenderTheme(new RenderTheme());
+        l.setTheme(new RenderTheme());
 
         MapRenderer.setBackgroundColor(0xffcccccc);
 
diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
index 302aca15..40be175d 100644
--- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
@@ -39,6 +39,12 @@ import org.slf4j.LoggerFactory;
 public class VectorTileLayer extends TileLayer {
     static final Logger log = LoggerFactory.getLogger(VectorTileLayer.class);
 
+    private final List<LList<TileLoaderProcessHook>> mLoaderProcessHooks = new List<>();
+
+    private final List<LList<TileLoaderThemeHook>> mLoaderThemeHooks = new List<>();
+
+    private IRenderTheme mTheme;
+
     public VectorTileLayer(Map map, TileSource tileSource) {
         this(map, new TileManager(map,
                         100),
@@ -102,7 +108,15 @@ public class VectorTileLayer extends TileLayer {
     /**
      * Set {@link IRenderTheme} used by {@link TileLoader}
      */
+    @Deprecated
     public void setRenderTheme(IRenderTheme theme) {
+        setTheme(theme);
+    }
+
+    /**
+     * Set {@link IRenderTheme} used by {@link TileLoader}
+     */
+    public void setTheme(IRenderTheme theme) {
         /* wait for loaders to finish all current jobs to
          * not change theme instance hold by loader instance
          * while running */
@@ -118,8 +132,6 @@ public class VectorTileLayer extends TileLayer {
         resumeLoaders();
     }
 
-    private IRenderTheme mTheme;
-
     public IRenderTheme getTheme() {
         return mTheme;
     }
@@ -155,12 +167,6 @@ public class VectorTileLayer extends TileLayer {
         public void complete(MapTile tile, boolean success);
     }
 
-    private List<LList<TileLoaderProcessHook>> mLoaderProcessHooks =
-            new List<LList<TileLoaderProcessHook>>();
-
-    private List<LList<TileLoaderThemeHook>> mLoaderThemeHooks =
-            new List<LList<TileLoaderThemeHook>>();
-
     public void addHook(TileLoaderProcessHook h) {
         mLoaderProcessHooks.append(new LList<TileLoaderProcessHook>(h));
     }
diff --git a/vtm/src/org/oscim/map/Map.java b/vtm/src/org/oscim/map/Map.java
index b93430b4..32253577 100644
--- a/vtm/src/org/oscim/map/Map.java
+++ b/vtm/src/org/oscim/map/Map.java
@@ -213,7 +213,7 @@ public abstract class Map implements TaskQueue {
         boolean themeSet = false;
         for (Layer layer : mLayers) {
             if (layer instanceof VectorTileLayer) {
-                ((VectorTileLayer) layer).setRenderTheme(theme);
+                ((VectorTileLayer) layer).setTheme(theme);
                 themeSet = true;
                 if (!allLayers)
                     break;