Cleanup: rename some compiler output variables