A little renaming to add some sense to it.