Correcting naming conventions