[core] variable renaming to avoid confusion