[skip-name-check]Update main pc with main - part 2
Part 2 of the update - this time only the renaming/refactoring changes which should be BE.
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Part 2 of the update - this time only the renaming/refactoring changes which should be BE.