Refactoring some naming
Refactoring some naming