update schemas to use actual names of related ids
change psuedo_organization to error if there isn't an org or default