Fixed up names to work with the origin_ callbacks