cleanup part 3, class rename Adapters