fixed final few references to old name