cleaned up terminology