Refactor sidebar for naming consistency

What does this MR do and why?

This MR refactors the sidebar code for naming consistency etc

Screenshots or screen recordings

How to set up and validate locally

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.