changed some name of struct