Refs #76: renaming