Git sync fork

@kevgo please review
This was an unrelated rename. Probably should have extracted it.