Changed schemaFactory name handling for schemas