Update to use new convention