Namespacing installed terms, making some other fixes.