Updated typedefs to modern syntax