Revise namevalue table to a better format