cllc: Rename some funcs to represent what they actually do