Remove short names constraint.