Corrected naming convention to new way