core: bit of internal renaming.