Cleanup and consistency of terms and definitions.