[SR-Dev] avp naming