Added more nodes

Standardized name and id attributes across all node types.