Fix code generation for additional elements that match C# keywords