Change oddly-named typ param to type