Updated variable naming to match naming conventions.