CS and function rename