Build fixes for git and renaming
Build fixes