Comply with matlab naming conventions