diff --git a/fairmq/FairMQStandaloneMerger.cxx b/fairmq/FairMQMerger.cxx
similarity index 100%
rename from fairmq/FairMQStandaloneMerger.cxx
rename to fairmq/FairMQMerger.cxx
diff --git a/fairmq/FairMQStandaloneMerger.h b/fairmq/FairMQMerger.h
similarity index 100%
rename from fairmq/FairMQStandaloneMerger.h
rename to fairmq/FairMQMerger.h
diff --git a/fairmq/FairMQBalancedStandaloneSplitter.cxx b/fairmq/FairMQSplitter.cxx
similarity index 100%
rename from fairmq/FairMQBalancedStandaloneSplitter.cxx
rename to fairmq/FairMQSplitter.cxx
diff --git a/fairmq/FairMQBalancedStandaloneSplitter.h b/fairmq/FairMQSplitter.h
similarity index 100%
rename from fairmq/FairMQBalancedStandaloneSplitter.h
rename to fairmq/FairMQSplitter.h