Rename collection and methods to avoid conflicts