More renaming, still figuring out Xcode and git.