Changed var names

Modified to match formatting.