Renamed constants because they are shared

Changed op-control to use constants shared among auto and op control.