Update to master conventions