Changed q() to quote() and qn() to quoteName()