made names shorter where applicable