refs #12: name change and slight reorder