Added and removed some Terms that were in wrong template.
Authored by: emlarsson 2021-01-27
Parent: [r6406]
Child: [r6408]