Handle R/C names smarter

They finally decapitalized Knight