Replace cm with vanir

Change-Id: I8883745498ba80c99081cb7a0769d07eb796f95e