diff --git a/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface b/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface
index b192c280ce..84ad95e062 100644
--- a/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface
+++ b/app/overrides/spree/admin/shared/_product_tabs/add_seo.html.haml.deface
@@ -1,5 +1,5 @@
 / insert_bottom "[data-hook='admin_product_tabs']"
 
-- klass = current == 'Search' ? 'active' : ''
+- klass = current == t(:Search) ? 'active' : ''
 %li{:class => klass}
   = link_to_with_icon 'icon-tasks', t(:Search), seo_admin_product_url(@product)
diff --git a/app/views/spree/admin/products/_seo_form.html.haml b/app/views/spree/admin/products/_seo_form.html.haml
index 28cee13bea..a717cd0bb2 100644
--- a/app/views/spree/admin/products/_seo_form.html.haml
+++ b/app/views/spree/admin/products/_seo_form.html.haml
@@ -1,6 +1,6 @@
 .row{"data-hook" => "admin_product_meta_form"}
   .alpha.eleven.columns
-    = f.field_container :meta_description do
+    = f.field_container :meta_keywords do
       = f.label :meta_keywords, t(:product_search_keywords)
       %br/
       = f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6
diff --git a/app/views/spree/admin/products/seo.html.haml b/app/views/spree/admin/products/seo.html.haml
index 77645f1940..9c47e41c57 100644
--- a/app/views/spree/admin/products/seo.html.haml
+++ b/app/views/spree/admin/products/seo.html.haml
@@ -1,5 +1,5 @@
 = render :partial => 'spree/admin/shared/product_sub_menu'
-= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Search' }
+= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => t(:Search) }
 = render :partial => 'spree/shared/error_messages', :locals => { :target => @product }
 
 = form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f|
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 32334f39dd..855b85a0c9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -452,6 +452,7 @@ en:
         upload_an_image: Upload an image
       product_search_keywords: Product Search Keywords
       SEO_keywords: SEO Keywords
+      Search: Search
       properties:
         property_name: Property Name
         inherited_property: Inherited Property
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index a9dad7e558..18dd52ed73 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -191,10 +191,10 @@ feature %q{
       fill_in 'Product Search Keywords', :with => 'Product Search Keywords'
       fill_in 'Notes', :with => 'Just testing Notes'
       click_button 'Update'
-      flash_message.should == "Product \"#{product.name}\" has been successfully updated!"
+      expect(flash_message).to eq("Product \"#{product.name}\" has been successfully updated!")
       product.reload
-      product.notes.should == 'Just testing Notes'
-      product.meta_keywords.should == 'Product Search Keywords'
+      expect(product.notes).to eq('Just testing Notes')
+      expect(product.meta_keywords).to eq('Product Search Keywords')
     end
 
     scenario "deleting product properties", js: true do
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index 1425167588..c226569dfb 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -214,8 +214,8 @@ feature "As a consumer I want to shop with a distributor", js: true do
         page.should_not have_content product.name
 
         fill_in "search", with: "Dome"           # For product with meta_keywords "Domestic"
-        page.should have_content product.name
-        page.should_not have_content product2.name
+        expect(page).to have_content product.name
+        expect(page).not_to have_content product2.name
       end
 
       it "returns search results for products where the search term matches one of the product's variant names" do