I also did the strategies -> extractor renamings