Bottle service to vanir nomoclature

Change-Id: I588655fd281de3dcbe52de4a010292655bd38d52