Rename lifetimes from 'self