Fixing constant rename, broken by merging.