Change generics naming