Tame: Clean up some terminologyz