Change notation to be more in-line with Bauer/Stone