refs #24: name change