more adapter name consistency