Renaming variables

Renaming of the struct
Including data-available-flag into struct
changing data type of flag

tested on an UM2