Correcting naming convention