Rename CCOMP Over 30 to Q_CCOMP Over 30

Standardize names for queries.