Changing naming convention from "block" to "node"