diff --git a/classes/Controller.php b/classes/Controller.php
index 0e0958a..8d3eaaa 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -452,6 +452,12 @@ class Controller extends Object
 	 */
 	public function prepareVariables($basename)
 	{
+		if (strpos($basename, '.') !== false)
+		{
+			list($basename, $action) = explode('.', $basename, 2);
+			$action                  = str_replace('.', '_', $action);
+		}
+
 		// Sets up all of our variables
 		$module_class      = strtr($basename, '/', '_');
 		$module_filename   = SITE_MODULE_PATH . $basename . '.php';
@@ -459,6 +465,14 @@ class Controller extends Object
 		$css_class         = $module_class;
 		$js_basename       = $basename;
 
+		if (isset($action))
+		{
+			$module_class      .= '_' . $action;
+			$template_basename .= '/' . $action;
+			$css_class         .= '_' . $action;
+			$js_basename       .= '/' . $action;
+		}
+
 		// Scrubs class names with hyphens
 		if (strpos($module_class, '-') !== false)
 		{
diff --git a/jar.php b/jar.php
index 9b815cb..c0d9bbb 100755
--- a/jar.php
+++ b/jar.php
@@ -1480,6 +1480,12 @@ class Controller extends Object
 	 */
 	public function prepareVariables($basename)
 	{
+		if (strpos($basename, '.') !== false)
+		{
+			list($basename, $action) = explode('.', $basename, 2);
+			$action                  = str_replace('.', '_', $action);
+		}
+
 		// Sets up all of our variables
 		$module_class      = strtr($basename, '/', '_');
 		$module_filename   = SITE_MODULE_PATH . $basename . '.php';
@@ -1487,6 +1493,14 @@ class Controller extends Object
 		$css_class         = $module_class;
 		$js_basename       = $basename;
 
+		if (isset($action))
+		{
+			$module_class      .= '_' . $action;
+			$template_basename .= '/' . $action;
+			$css_class         .= '_' . $action;
+			$js_basename       .= '/' . $action;
+		}
+
 		// Scrubs class names with hyphens
 		if (strpos($module_class, '-') !== false)
 		{