correcting naming convention