Changed variable naming

Variable names make more sense now.