revised p5/p6 table names and definitions.