Add terms and tmp namespace