Fix for #4406, #4291 -- add in renaming for reserved words #911

Job	Run time
cpp-lib-build (macos-11, clang, ON)	1m 33s
build (macos-11, tool)	2m 8s
cpp-lib-build (macos-11, clang, OFF)	1m 41s
build (macos-11, cpp)	28m 6s
cpp-lib-build (macos-11, gcc, ON)	2m 50s
build (macos-11, csharp)	11m 2s
cpp-lib-build (macos-11, gcc, OFF)	3m 12s
build (macos-11, dart)	5m 59s
cpp-lib-build (ubuntu-20.04, clang, ON)	1m 55s
build (macos-11, go)	5m 22s
cpp-lib-build (ubuntu-20.04, clang, OFF)	2m 11s
build (macos-11, java)	2m 17s
cpp-lib-build (ubuntu-20.04, gcc, ON)	1m 44s
build (macos-11, javascript)	3m 15s
cpp-lib-build (ubuntu-20.04, gcc, OFF)	2m 7s
build (macos-11, typescript)	18m 25s
build (macos-11, php)	2m 37s
cpp-lib-build (windows-2022, clang, ON)	7m 17s
build (macos-11, python3)	2m 19s
cpp-lib-build (windows-2022, clang, OFF)	12m 21s
build (ubuntu-20.04, tool)	1m 27s
cpp-lib-build (windows-2022, cl)	6m 32s
build (ubuntu-20.04, cpp)	23m 56s
build (ubuntu-20.04, csharp)	9m 9s
build (ubuntu-20.04, dart)	6m 41s
build (ubuntu-20.04, go)	3m 42s
build (ubuntu-20.04, java)	1m 28s
build (ubuntu-20.04, javascript)	1m 54s
build (ubuntu-20.04, typescript)	16m 35s
build (ubuntu-20.04, php)	1m 58s
build (ubuntu-20.04, python3)	1m 50s
build (windows-2022, tool)	2m 43s
build (windows-2022, cpp)	34m 10s
build (windows-2022, csharp)	13m 53s
build (windows-2022, dart)	9m 56s
build (windows-2022, go)	14m 13s
build (windows-2022, java)	2m 26s
build (windows-2022, javascript)	5m 13s
build (windows-2022, typescript)	46m 42s
build (windows-2022, php)	3m 43s
build (windows-2022, python3)	5m 45s
	5h 32m 17s

Provide feedback