Rename KSHORT to CSHORT