Cleanup Node reporting and standardize naming to match those used by ES