[sr-dev] git:master:0ea60341: avp: rename local variable to prevent shadowing the global structure