Renamed package store to model.  Other minor renames.