Added ORG_NAME type to allow numbers in name