added missing prefix to functions and datatypes, repaired files header