small improvement to cl names