Moved QNames to appropriate locations