hlint fixes
Rename Subject > Channel