Rename and finalisation