lots of class renaming to support favorites layer