diff --git a/lang/fi.yml b/lang/fi.yml
index f8a4426..2cdb848 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -1,7 +1,8 @@
-FI:
+fi:
   SilverStripe\FullTextSearch\Solr\Forms\SearchForm:
-    GO: Suorita
+    GO: Hae
     SEARCH: Haku
+  Results:
     SearchQuery: 'Hakusanasi oli'
     DidYouMean: 'Tarkoititko'
     ReadMore: 'Lue lisää'
diff --git a/templates/Layout/Page_results_solr.ss b/templates/Layout/Page_results_solr.ss
index aa96265..a6af324 100644
--- a/templates/Layout/Page_results_solr.ss
+++ b/templates/Layout/Page_results_solr.ss
@@ -1,12 +1,12 @@
 <div id="Content" class="searchResults">
-    <h1>$Title</h1>
+    <h1>$Title rer</h1>
 
     <% if $Query %>
-        <p class="searchQuery"><%t SearchQuery 'You searched for' %> &quot;{$Query}&quot;</p>
+        <p class="searchQuery"><%t Results.SearchQuery 'You searched for' %> &quot;{$Query}&quot;</p>
     <% end_if %>
 
     <% if $Results.Suggestion %>
-        <p class="spellCheck"><%t DidYouMean 'Did you mean' %> <a href="{$Link}SearchForm?Search=$Results.SuggestionQueryString">$Results.SuggestionNice</a>?</p>
+        <p class="spellCheck"><%t Results.DidYouMean 'Did you mean' %> <a href="{$Link}SearchForm?Search=$Results.SuggestionQueryString">$Results.SuggestionNice</a>?</p>
     <% end_if %>
 
     <% if $Results.Matches %>
@@ -23,12 +23,12 @@
                         </a>
                     </h4>
                     <p><% if $Abstract %>$Abstract.XML<% else %>$Content.ContextSummary<% end_if %></p>
-                    <a class="readMoreLink" href="$Link" title="Read more about &quot;{$Title}&quot;"><%t ReadMore 'Read more about' %> &quot;{$Title}&quot;...</a>
+                    <a class="readMoreLink" href="$Link" title="Read more about &quot;{$Title}&quot;"><%t Results.ReadMore 'Read more about' %> &quot;{$Title}&quot;...</a>
                 </li>
             <% end_loop %>
         </ul>
     <% else %>
-        <p><%t NoResults 'Sorry, your search query did not return any results.' %></p>
+        <p><%t Results.NoResults 'Sorry, your search query did not return any results.' %></p>
     <% end_if %>
 
     <% if $Results.Matches.MoreThanOnePage %>
@@ -50,7 +50,7 @@
                     <a class="next" href="$Results.Matches.NextLink" title="View the next page">&rarr;</a>
                 <% end_if %>
             </div>
-            <p><%t Page 'Page' %> $Results.Matches.CurrentPage <%t of 'of' %> $Results.Matches.TotalPages</p>
+            <p><%t Results.Page 'Page' %> $Results.Matches.CurrentPage <%t Results.of 'of' %> $Results.Matches.TotalPages</p>
         </div>
     <% end_if %>
 </div>