20140916 - Corrected naming convention errors