refs #8: mostly name changes and comments