Replacing variable with proper variable name after struct changes