some variable name changes