Just modifying some variable names