Refactoring node-type name and field names. This update may break things with existing content.