Rename now uses the correct offset - so it can rename parameters