updates to variable names and conventions