Changed Generic Types to match the java standard (Single letter capitals).

Issue: FMA-48
Change-Id: Ie576ec86de8b4ae0c3df8488c46f9c64a7bc7f9f