changed code to better reflect naming conventions.