use type name instead of machine type name

This patch is half bug fix, half feature addition as it first replaces the use of raw type names with the human description, and also adds a plural, so when view lists of favorites, it "favorite pages" instead of "favorite page"