refactored names, removing Term from things that were more general
closes #60