Topic cleanup stores

@CHenrie Please review. This reverts all item/items back to entry/entries for backwards compatibility and consistency.