Some variable name refactoring