Bluebird name change to fix #1742.