diff --git a/app/views/admin_panel/site_info.rhtml b/app/views/admin_panel/site_info.rhtml
index 957dfa8..e66f5cc 100644
--- a/app/views/admin_panel/site_info.rhtml
+++ b/app/views/admin_panel/site_info.rhtml
@@ -6,7 +6,7 @@
 
 <% labelled_form_for :environment, @environment do |f| %>
 
-  <%= labelled_form_field(_('Site name'), f.text_field(:name)) %>
+  <%= labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
 
   <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%') %>
 
diff --git a/features/environment_name.feature b/features/environment_name.feature
index 63c96d3..d96792d 100644
--- a/features/environment_name.feature
+++ b/features/environment_name.feature
@@ -7,6 +7,6 @@ Feature: setting environment name
     Given I am logged in as admin
     When I follow "Administration"
     And I follow "Edit site info"
-    And I fill in "Name" with "My environment"
+    And I fill in "Site name" with "My environment"
     And I press "Save"
     Then I should see "My environment" within "title"
--
libgit2 0.21.2