changed some more label to the discussed conventions