Better names (closes #32)