Fix the classes to be non-Java. :)