Class names renamed to make them java-style