Fixed names to match Java conventions