More variable renaming to avoid conflicts when module closures are removed.