Merge "Generify variable name" into rvc-dev