fixed deterministic short names