Adapted matrix variables to new defaults structure.