more typename fixes