Yet another convention change