CDAP-531: Variable names improvements