Fix errors relating to associated constants in cargo check

[neeldug]

Currently cargo check fails relating to this, this is a simple change to migrate the constants to the associated versions rather than the modular versions.