Added detail to various variable names.