Changing names of some internals.