Improve basic definitions; fix terminology