Refractored matrix function names