Changed variable names for consistancy (test push)