fix typedef and value name