diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb
index a64e48a6a..e9a9bf13d 100644
--- a/spec/features/admin/settings_spec.rb
+++ b/spec/features/admin/settings_spec.rb
@@ -22,7 +22,7 @@ feature 'Admin settings' do
 
     within("#edit_setting_#{@setting2.id}") do
       fill_in "setting_#{@setting2.id}", with: 'Super Users of level 2'
-      click_button 'Update Setting'
+      click_button 'Update'
     end
 
     expect(page).to have_content 'Setting updated!'
diff --git a/spec/features/admin_spec.rb b/spec/features/admin_spec.rb
index 6c19b03f7..a096b2b83 100644
--- a/spec/features/admin_spec.rb
+++ b/spec/features/admin_spec.rb
@@ -85,7 +85,7 @@ feature 'Admin' do
 
       fill_in 'tag_name', with: 'Papeleras'
 
-      click_on 'Create Tag'
+      click_on 'Create Topic'
 
       expect(page).to have_content 'Papeleras'
     end
@@ -97,7 +97,7 @@ feature 'Admin' do
 
       expect(page).to have_content 'Mi barrio'
 
-      click_link 'Delete Tag'
+      click_link 'Delete Topic'
 
       expect(page).not_to have_content 'Mi barrio'
     end
@@ -110,7 +110,7 @@ feature 'Admin' do
       expect(page).to have_content 'Mi barrio'
 
       check "tag_featured_#{unfeatured_tag.id}"
-      click_button 'Update Tag'
+      click_button 'Update Topic'
 
       expect(page).to have_checked_field("tag_featured_#{unfeatured_tag.id}")
     end