Refactor: remove 'album' from method and view names