Are we changing this convention?