Merge "Use correct binder opcode names"