diff --git a/lib/SimpleSAML/XHTML/TemplateLoader.php b/lib/SimpleSAML/XHTML/TemplateLoader.php
index e24dd2700a5e55b4c9f49ea1b2f114c6846c5e6b..d3a9f853c691beff206109a192ae4059faff58e0 100644
--- a/lib/SimpleSAML/XHTML/TemplateLoader.php
+++ b/lib/SimpleSAML/XHTML/TemplateLoader.php
@@ -25,6 +25,22 @@ class TemplateLoader extends \Twig\Loader\FilesystemLoader
         return parent::findTemplate($name);
     }
 
+
+    protected function parseName($name, $default = self::MAIN_NAMESPACE)
+    {
+        if (strpos($name, ':')) {
+            // we have our old SSP format
+            list($namespace, $shortname) = explode(':', $name, 2);
+            $shortname = strtr($shortname, array(
+                '.tpl.php' => '.twig',
+                '.php' => '.twig',
+            ));
+            return array($namespace, $shortname);
+        }
+        return parent::parseName($name, $default);
+    }
+
+
     /**
      * Get the template directory of a module, if it exists.
      *