Fixing some identifier names