Renamed and changed convention of structs