Adjusted naming of collections