Update naming of variables to match standards