diff --git a/houdini/soho/parameters/HdMoonrayRendererPlugin_Light.ds b/houdini/soho/parameters/HdMoonrayRendererPlugin_Light.ds
index f1582e1..36d6b3e 100644
--- a/houdini/soho/parameters/HdMoonrayRendererPlugin_Light.ds
+++ b/houdini/soho/parameters/HdMoonrayRendererPlugin_Light.ds
@@ -21,7 +21,7 @@
         label   "class"
         type    string
         invisible
-        default { [ "\n        parm = hou.parm(\"lighttype\")\n        if parm:\n            value = parm.eval()\n            label = parm.menuLabels()[value]\n            if label == \"Geometry\":\n                label = \"Mesh\"\n            elif label == \"Rectangle\":\n                label = \"Rect\"\n            return label + \"Light\"\n        else:\n            parm = hou.parm(\"primtype\")\n            value = parm.eval()\n            if value == \"UsdLuxDomeLight\":\n                return \"EnvLight\"\n        " python ] }
+        default { [ "\n        parm = hou.parm(\"lighttype\")\n        if parm:\n            value = parm.eval()\n            label = parm.menuLabels()[value]\n            if label == \"Geometry\":\n                label = \"Mesh\"\n            elif label == \"Rectangle\":\n                label = \"Rect\"\n            return label + \"Light\"\n        else:\n            parm = hou.parm(\"primtype\")\n            value = parm.eval()\n            primtype_to_class = {\n                \"UsdLuxDomeLight\": \"EnvLight\",\n                \"UsdLuxDomeLight_1\": \"EnvLight\",\n                \"UsdLuxDistantLight\": \"DistantLight\",\n                \"UsdLuxRectLight\": \"RectLight\",\n                \"UsdLuxSphereLight\": \"SphereLight\",\n                \"UsdLuxDiskLight\": \"DiskLight\",\n                \"UsdLuxCylinderLight\": \"CylinderLight\",\n                \"UsdLuxPortalLight\": \"PortalLight\",\n                \"UsdLuxGeometryLight\": \"MeshLight\",\n            }\n            if value in primtype_to_class:\n                return primtype_to_class[value]\n        " python ] }
         disablewhen "{ xn__moonrayclass_control_o8a == block } { xn__moonrayclass_control_o8a == none }"
         parmtag { "usdvaluetype" "token" }
     }
diff --git a/houdini/soho/parameters/moonray_Light.ds b/houdini/soho/parameters/moonray_Light.ds
index 88fc327..af03932 100644
--- a/houdini/soho/parameters/moonray_Light.ds
+++ b/houdini/soho/parameters/moonray_Light.ds
@@ -20,7 +20,7 @@
         label   "class"
         type    string
         invisible
-        default { [ "\n        parm = hou.parm(\"lighttype\")\n        if parm:\n            value = parm.eval()\n            label = parm.menuLabels()[value]\n            if label == \"Geometry\":\n                label = \"Mesh\"\n            elif label == \"Rectangle\":\n                label = \"Rect\"\n            return label + \"Light\"\n        else:\n            parm = hou.parm(\"primtype\")\n            value = parm.eval()\n            if value == \"UsdLuxDomeLight\":\n                return \"EnvLight\"\n        " python ] }
+        default { [ "\n        parm = hou.parm(\"lighttype\")\n        if parm:\n            value = parm.eval()\n            label = parm.menuLabels()[value]\n            if label == \"Geometry\":\n                label = \"Mesh\"\n            elif label == \"Rectangle\":\n                label = \"Rect\"\n            return label + \"Light\"\n        else:\n            parm = hou.parm(\"primtype\")\n            value = parm.eval()\n            primtype_to_class = {\n                \"UsdLuxDomeLight\": \"EnvLight\",\n                \"UsdLuxDomeLight_1\": \"EnvLight\",\n                \"UsdLuxDistantLight\": \"DistantLight\",\n                \"UsdLuxRectLight\": \"RectLight\",\n                \"UsdLuxSphereLight\": \"SphereLight\",\n                \"UsdLuxDiskLight\": \"DiskLight\",\n                \"UsdLuxCylinderLight\": \"CylinderLight\",\n                \"UsdLuxPortalLight\": \"PortalLight\",\n                \"UsdLuxGeometryLight\": \"MeshLight\",\n            }\n            if value in primtype_to_class:\n                return primtype_to_class[value]\n        " python ] }
         disablewhen "{ xn__moonrayclass_control_o8a == block } { xn__moonrayclass_control_o8a == none }"
         parmtag { "usdvaluetype" "token" }
     }