updated data names and suffixes (suff) :D