Correcting naming