I will rename the enum.
Don't you think that the MergeCommand-refactoring is better to do by another, standalone commit?