Mostly variable renaming inline with convention