Bug 2245 - Changed type parameters to comply with naming conventions