Rename some locals.