Cleanup: Type argument names