Simplify following and canonicalize variable names