Remove silly naming restriction