Fixed some variable names being misleading