Remove templating from the contract
Renamed type to match library