fix naming

Conflicts:
	cm.mk