Changes class name and method names to better follow conventions.