Fixes

Fixed the naming conventions.

The Main.java class, previously aa.java class should no longer be broken.