Use better naming in GDT code.