Improved generic naming

Changed all references to the identity type as just T to TIdentity