Renamed classes / config from MergeXXX to OverlayXXX