Fixed issues with Java class / variable captialization