Added short name for organizations