Fix and /del improvement to support names