Naming changes and internal modification