Renaming ContactEntityFactory to ContactEntityExtractor