That seems reasonable but I'll leave it to a PR that fixes all these things and makes it a convention