DATACASS-74 - Fixing variable names.