rename and be safe