Cleaned up aliases, added renewip for OSX