Corrected naming convetion