rename shadowed lifetimes