Changed misleading variable names