changed mappingAnalizer to use given name