Issue #153: Convert node entities to classed objects. Correcting docblock class names.