Actually use the correct temporary variable names.