core: few naming tweaks after last commit. round 2.