[FIX] Fixed datapoint names and added missing datapoints