corrected naming convention