Name refactoring
Refactoring context usage