Mac build setup and renames