Avoid cross-directory renames and linking on object creation