Remove useless 'Node' & add some 'Converter' in class names