Renamed variables

Variables renamed to follow standards. Some cosmetic improvements and
redaction issues.