cleanup: Rename some path variables for consistency and clarity.

No functional changes.