refs #14: refactor, name changes, test updates