Renaming matrix and vector