sml: rename simple name in mock factory to type name
sml: distinguish between type names and concept names in mock factory
sml: more refactoring around indexing of concepts