[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.