rename entities to collections and other name changes