fix: eliminating name clashes with keywords

Created by  Frank Uhlig  on April 7, 2022
HBOJKQ6CYVMAO25IAEFZC22UVNBR4JP7WA6DSQ3EKI27B45VAWAQC
Change contents