Fixed inner _rename method