Table 8.83 MARK_TYPE

Change to "MARINE_MARK_TYPE".

Table 8.83 NAUTICAL_GATE_TYPE

Change to "WATER_GATE_TYPE".