some 'cosmetic' variable renaming for one code style