CSPCE-6278: Fix variable names.