removed "T2" reference from all method names

-other than slightly changing the method names, this edit makes no
change to the functionality of the library