follow naming conventions instance methods in all specs
merge spec renamings from upstream