WCM-195 fix wrong context variable
WCM-195 SF
WCM-195 Make field names and variable names consistent