Don't use op_id in code unless it is intentionally ambiguous

[mdr223]

There are a number of places in the code where we use op_id to refer to a physical_op_id or a logical_op_id; we should rename all such instances (where the op_id is not intentionally ambiguous) to explicitly be phsyical_op_id or logical_op_id.