Readjusted inititialization of matrices for new names.