core: few naming tweaks after last commit.