Adjusted query to full caps db names