Simplest was just to rename that extra long name and move files in git
accordingly