Fixed an oversight where I forgot to move some constants after refactoring