RUBY-770 Fix specs on collection renames