Both full names as well as short names are now accepted.