Changed naming to Python standards (was in camel case)