Fixed the type parameters throughout the library.

Issue: FMA-45
Change-Id: I1a2c5006e3e20076c5846ef525be057aeead2c74