Rename some references to clarify
Autoformat