Minor renames and module/FilesToFilesMerger2Transformer/