Removed redundant type name from the end of the name component + some Node cleanup