Fix rename and add key