rename *Query to *Resource