0251: renamed more variables