I agree - it seems as though this will crop up a few times, best to have some conventions in place to avoid this. Do you want that fix in this PR?