Misc. Fix file renaming. Rich node types.