move away from .cl naming convention