Naming-inconsistency fixed #2