Refactoring mostly of variable names