Follow up of b2ee1770d4 and 10c2254d41, part of T74432. Now the area and region naming conventions should be less confusing. Mostly a careful batch rename but had to do few smaller fixes. Also ran clang-format on affected files.
b2ee1770d4
10c2254d41