Improve term consistency