rename some locals