Revert "ox: Change label naming scheme"