Name refactoring
Minor changes