Add Repository Names, tidy Package Names