Fixing variable names issue in patch given by Chanaka in STRATOS-555