remove generics
rename classes
channel databinding tests