Corrected naming scheme