Code cleanup
Name refactoring