Changed harmony typedefs