Correcting naming issues.