Updated naming conventions to match proper Java conventions.