change Entity Name
refactor and fix Favorites functionality