Cleanup/rename for OSX