Fix issues with - in names