fixed old naming
extracted and refactored activity feed