switched some names to the post-cleanup terminology (they were simply forgotten in the cleanup process ...)
merged terminology changes from master