CSPACE-6273: Revert variable name. Move and rename constant within custom function.