refactor schema and model nameing