Corrected naming conventions