diff --git a/tests/browser/features/support/modules/reference_module.rb b/tests/browser/features/support/modules/reference_module.rb
index 3e16553..1e5d1bc 100644
--- a/tests/browser/features/support/modules/reference_module.rb
+++ b/tests/browser/features/support/modules/reference_module.rb
@@ -1,81 +1,81 @@
 # -*- encoding : utf-8 -*-
 # Wikidata UI tests
 #
 # Author:: Tobias Gritschacher (tobias.gritschacher@wikimedia.de)
 # License:: GNU GPL v2+
 #
 # module for reference page object
 
 module ReferencePage
   include PageObject
   # references UI elements
   a(:add_reference, css: 'div.wikibase-statementview-references > div.wikibase-addtoolbar-container span.wikibase-toolbar-button-add:not(.wikibase-toolbarbutton-disabled) > a')
   a(:add_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-add.wikibase-toolbarbutton-disabled > a')
   a(:save_reference, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-save:not(.wikibase-toolbarbutton-disabled) > a')
   a(:save_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-save.wikibase-toolbarbutton-disabled > a')
   a(:cancel_reference, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-cancel:not(.wikibase-toolbarbutton-disabled) > a')
   a(:cancel_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-cancel.wikibase-toolbarbutton-disabled > a')
   a(:edit_reference, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-edit:not(.wikibase-toolbarbutton-disabled) > a')
   a(:edit_reference_disabled, css: 'div.wikibase-statementview-references span.wikibase-toolbar-button-edit.wikibase-toolbarbutton-disabled > a')
   a(:remove_reference, css: 'div.wikibase-statementview-references .wikibase-edittoolbar-container span.wikibase-toolbar-button-remove:not(.wikibase-toolbarbutton-disabled) > a')
   a(:remove_reference_disabled, css: 'div.wikibase-statementview-references .wikibase-edittoolbar-container span.wikibase-toolbar-button-remove.wikibase-toolbarbutton-disabled > a')
-  a(:add_reference_snak, css: 'div.wikibase-statementview-references div.wb-referenceview span.wikibase-toolbar-button-add:not(.wikibase-toolbarbutton-disabled) > a')
-  a(:add_reference_snak_disabled, css: 'div.wikibase-statementview-references div.wb-referenceview span.wikibase-toolbar-button-add.wikibase-toolbarbutton-disabled > a')
+  a(:add_reference_snak, css: 'div.wikibase-statementview-references div.wikibase-referenceview span.wikibase-toolbar-button-add:not(.wikibase-toolbarbutton-disabled) > a')
+  a(:add_reference_snak_disabled, css: 'div.wikibase-statementview-references div.wikibase-referenceview span.wikibase-toolbar-button-add.wikibase-toolbarbutton-disabled > a')
   span(:reference_counter, css: 'div.wikibase-statementview-references-heading span.ui-toggler-label')
 
   def remove_reference_snak(snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wb-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove:not(.wikibase-toolbarbutton-disabled) > a")
+    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove:not(.wikibase-toolbarbutton-disabled) > a")
   end
 
   def remove_reference_snak_disabled(snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wb-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove.wikibase-toolbarbutton-disabled > a")
+    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview div.wikibase-snaklistview:nth-child(#{snak_index}) span.wikibase-toolbar-button-remove.wikibase-toolbarbutton-disabled > a")
   end
 
   def reference_snak_property(reference_index = 1, snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wb-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property")
+    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property")
   end
 
   def reference_snak_property_link(reference_index = 1, snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wb-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property a")
+    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-property a")
   end
 
   def reference_snak_value(reference_index = 1, snak_index = 1)
-    @browser.element(css: "div.wikibase-statementview-references div.wb-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-value")
+    @browser.element(css: "div.wikibase-statementview-references div.wikibase-referenceview:nth-child(#{reference_index}) div.wikibase-snaklistview:nth-child(#{snak_index}) div.wikibase-snakview-value")
   end
 
   def toggle_references(statement_index = 1)
     @browser.element(css: "div.wikibase-statementview:nth-child(#{statement_index}) div.wikibase-statementview-references-heading a.ui-toggler")
   end
 
   def get_number_of_references_from_counter
     scanned = reference_counter.scan(/([^ ]+)/)
     scanned[0][0]
   end
 
   def wait_for_reference_save_button
     save_reference_element.when_visible
   end
 
   def add_reference_snaks(snaks, properties)
     index = 1
     add_reference
     snaks.each do |snak|
       if add_reference_snak?
         add_reference_snak
       end
       property_handle = snak[0]
       value = snak[1]
       snak_entity_selector_input_wd(index).clear
       snak_entity_selector_input_wd(index).send_keys properties[property_handle]['label']
       ajax_wait
       sleep 1 # FIXME: replace with conditional wait for absence of loading-spinner
       snak_value_input_field_wd(index).clear
       snak_value_input_field_wd(index).send_keys value
       ajax_wait
       index = index + 1
     end
     save_reference
     ajax_wait
     wait_for_statement_request_finished
   end
 end