Renamed nodes to match convention. Core no longer depends on external nodes.