Adjusted variable consistency for redability to match other conventions