Changed name convention to c# convention