Favorites refactoring
Renamed properties in user settings