refactor and rename feeds and entries