updates to use short_name for db