Fix/whirr uses new style entities

note builds on pull 554 (trivial)