Fixed a few TGI/khronos name problems