Naming-inconsistency fixed