Renamed some matrix functions