CSPACE-6266: Corrected variable names.