added defaulting to old naming of schemas if no name is set