AVD_NAME defined in matrix now