Update the distribution following on from refactoring of the subsystem.