VID-1355 renaming vars and methods