Fix compile errors, match naming conventions for generics