Change names to subpackages.