Update to new TW5 classnames

For #43