Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
Be consistent with the aliases - you have a mix of large & small letters.