Fix node / Folder model ambiguity