Minor design/naming changes for consistency w/ existing practices.