Better baton naming