Naming of variables. Part of switch to less OO.