Update conventions with Declan's original gist