adding Gt prefix to several classes