Update and rename merk_nicki.mk to omni_nicki.mk