Rename SC and SE to be more descriptive, follow M4 guidelines