[rep137] minor naming and formulation changes