Fixed side effects of renaming collections