Cleanup identifier names