Rewrite some of the method name stuff and class name stuff for scala