Fixed variable naming to remove warnings