Swap ordering for v1.0 due to class constant