Extended layer renaming to unpickling code