Vanir - Manta, Manta - Vanir

Change-Id: Ie6c21369beb5da4630812f5f56ae71d291666a49
Signed-off-by: DHO <DHO@dho.im>