Move s_model to netlist
Force labels to be consistent
Strip V label