changed some mistakes in naming