Matrix: Removing Matrix suffix to static methods