Refactoring: rename unclearly variable names