Fixes of variable names