changed names of typedefs