bug fix in variable name

bug fix in variable name. Cleaned up naming to be consistent.