diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index b2e08efe97e15057bd35e9f85897f1ecc9c8316e..b0ec11df6b17b4d6d3d48a69854c206d25f533d2 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -483,8 +483,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
             $previousPage['aHref'] = BackendUtility::getModuleUrl('web_ts', $urlParameters);
             $moduleContent['previousPage'] = $previousPage;
         }
-        $view = $this->getFluidTemplateObject('tstemplate', 'Main');
-        $view->assign('partialName', 'NoTemplate');
+        $view = $this->getFluidTemplateObject('tstemplate', 'NoTemplate');
         $view->assign('content', $moduleContent);
         return $view->render();
     }
@@ -674,8 +673,7 @@ page.10.value = HELLO WORLD!
         $view = GeneralUtility::makeInstance(StandaloneView::class);
         $view->getRenderingContext()->getTemplatePaths()->fillDefaultsByPackageName($extensionName);
         $view->getRenderingContext()->setControllerAction($templateName);
-        // @TODO: not sure this should stay; this value should in any case be a *proper* extension name!
-        $view->getRequest()->setControllerExtensionName('web_ts');
+        $view->getRequest()->setControllerExtensionName('tstemplate');
         return $view;
     }
 
diff --git a/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html
similarity index 100%
rename from typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
rename to typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html