Fix SchemaParserTest by importing types.
Work on refactoring so that names and long names are more consistently defined.