Various terminology modifications and cleanups.