diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index 09fb572..85ca0fb 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -1,7 +1,7 @@
 
 Neos:
   Neos:
-    typoScript:
+    fusion:
       autoInclude:
         Flowpack.SimpleSearch.ContentRepositoryAdaptor: true
   ContentRepository:
diff --git a/Resources/Private/Templates/NodeTypes/Search.html b/Resources/Private/Templates/NodeTypes/Search.html
index 76f519d..918525f 100644
--- a/Resources/Private/Templates/NodeTypes/Search.html
+++ b/Resources/Private/Templates/NodeTypes/Search.html
@@ -1,11 +1,11 @@
 
 {namespace neos=Neos\Neos\ViewHelpers}
-{namespace ts=Neos\Fusion\ViewHelpers}
-{namespace typo3cr=Neos\ContentRepository\ViewHelpers}
+{namespace fusion=Neos\Fusion\ViewHelpers}
+{namespace cr=Neos\ContentRepository\ViewHelpers}
 <div class="flowpack-simplesearch-search">
 	<form method="POST">
 		<input name="search[word]" value="{searchWord}" />
-		<input type="hidden" name="--typo3-typo3cr-viewhelpers-widget-paginateviewhelper[currentPage]" value="" />
+		<input type="hidden" name="--neos-contentrepository-viewhelpers-widget-paginateviewhelper[currentPage]" value="" />
 		<button type="submit">&gt;</button>
 	</form>
 	<hr />
@@ -13,20 +13,20 @@
 		<f:if condition="{searchWord}">
 			<f:if condition="{searchResults -> f:count()}">
 				<dl>
-					<typo3cr:widget.paginate nodes="{searchResults}" as="paginatedNodes" configuration="{itemsPerPage: 5}">
+					<cr:widget.paginate nodes="{searchResults}" as="paginatedNodes" configuration="{itemsPerPage: 5}">
 						<f:for each="{paginatedNodes}" as="searchResult">
 							<dt>
 								<neos:link.node node="{searchResult}">{searchResult.fullLabel}</neos:link.node>
 							</dt>
 
 							<dd>
-								<ts:render path="searchResultContent" context="{searchResult: searchResult}" />
+								<fusion:render path="searchResultContent" context="{searchResult: searchResult}" />
 							</dd>
 							<hr />
 						</f:for>
-					</typo3cr:widget.paginate>
+					</cr:widget.paginate>
 				</dl>
 			</f:if>
 		</f:if>
 	</div>
-</div>
\ No newline at end of file
+</div>