Change classes to typedefs