This is good.  I wonder whether we should now also be removing the 'faceted' prefix from our code also, as it's now redundant (i.e. our search is always faceted).