Renamed splitter and related entities to match STEPMerge