"Change 2" naming convention fix