Renamed OP styles to avoid merge conflicts.