diff --git a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
index 014771aed..5a7dc5102 100644
--- a/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
+++ b/Templates/BaseGame/game/tools/worldEditor/gui/guiTerrainMaterialDlg.ed.gui
@@ -536,7 +536,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
             profile = "ToolsGuiDefaultProfile";
                tooltipProfile = "ToolsGuiToolTipProfile";
             };
-         new GuiContainer(ORMMapContainer) {
+         new GuiContainer(ORMConfigMapContainer) {
             position = "6 314";
                   extent = "261 64";
                horizSizing = "width";
@@ -576,7 +576,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
                   profile = "ToolsGuiTextProfile";
                   tooltipProfile = "ToolsGuiToolTipProfile";
                   isContainer = "0";
-               internalName = "ORMMapAssetId";
+               internalName = "ORMConfigMapAssetId";
                };
                new GuiButtonCtrl() {
                   text = "Edit";
@@ -584,7 +584,7 @@ $guiContent = new GuiControl(TerrainMaterialDlg,EditorGuiGroup) {
                   extent = "40 16";
                   horizSizing = "left";
                   profile = "ToolsGuiButtonProfile";
-               command = "TerrainMaterialDlg.updateTextureMap(\"OrmConfigMap\");";
+               command = "TerrainMaterialDlg.updateTextureMap(\"ORMConfigMap\");";
                   tooltipProfile = "ToolsGuiToolTipProfile";
                };
                new GuiBitmapButtonCtrl() {
diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
index 1eb7af85d..4a7338c24 100644
--- a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
+++ b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
@@ -262,8 +262,8 @@ function TerrainMaterialDlg::clearTextureMap(%this, %mapName)
       NormalMapContainer.callOnChildren("setActive", false);  
       %this.clearTextureMap("NormalMap");
       
-      ORMMapContainer.callOnChildren("setActive", false);
-      %this.clearTextureMap("ORMMap");
+      ORMConfigMapContainer.callOnChildren("setActive", false);
+      %this.clearTextureMap("ORMConfigMap");
       
       MacroMapContainer.callOnChildren("setActive", false);
       %this.clearTextureMap("MacroMap");
@@ -292,7 +292,7 @@ function TerrainMaterialDlg::changeTerrainMatMapAsset(%this)
       {
          //show the supplemental maps
          NormalMapContainer.callOnChildren("setActive", true);  
-         ORMMapContainer.callOnChildren("setActive", true);
+         ORMConfigMapContainer.callOnChildren("setActive", true);
          MacroMapContainer.callOnChildren("setActive", true);
       }
    }
@@ -377,13 +377,13 @@ function TerrainMaterialDlg::activateMaterialCtrls( %this, %active )
    if(%this-->texDetailMap.getBitmap() $= "" || %this-->texDetailMap.getBitmap() $= $TerrainMaterialEditor::emptyMaterialImage)
    {
       NormalMapContainer.callOnChildren("setActive", false);  
-      ORMMapContainer.callOnChildren("setActive", false);
+      ORMConfigMapContainer.callOnChildren("setActive", false);
       MacroMapContainer.callOnChildren("setActive", false);
    }
    else
    {
       NormalMapContainer.callOnChildren("setActive", true);  
-      ORMMapContainer.callOnChildren("setActive", true);
+      ORMConfigMapContainer.callOnChildren("setActive", true);
       MacroMapContainer.callOnChildren("setActive", true); 
    }
 }
@@ -438,7 +438,7 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
       //
       %imgPath = %mat.getORMConfigMap();
       %imgPathText = %imgPath !$= "" && %imgPath !$= $TerrainMaterialEditor::emptyMaterialImage ? %mat.getORMConfigMapAsset() : "None";
-      %this-->ORMMapAssetId.setText( %imgPathText );
+      %this-->ORMConfigMapAssetId.setText( %imgPathText );
       %this-->texORMConfigMap.setBitmap( getAssetPreviewImage(%imgPath) );
        
       //
@@ -656,7 +656,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %materialAssetId )
       %newNormal = "";
    
    //---
-   %newormConfig = %this-->ORMMapAssetId.text;
+   %newormConfig = %this-->ORMConfigMapAssetId.text;
    if(%newormConfig $= "None")
       %newormConfig = "";
    
@@ -995,9 +995,9 @@ function NormalMapContainer::onControlDropped( %this, %payload, %position )
    terrMatEdDragNDropMapAssignment("NormalMap", %payload);
 }
 
-function ORMMapContainer::onControlDropped( %this, %payload, %position )
+function ORMConfigMapContainer::onControlDropped( %this, %payload, %position )
 {
-   terrMatEdDragNDropMapAssignment("ORMMap", %payload);
+   terrMatEdDragNDropMapAssignment("ORMConfigMap", %payload);
 }
 
 function MacroMapContainer::onControlDropped( %this, %payload, %position )