Table 8.113 MARINE_OVERHEAD_OBSTRUCTION
Change to "WATER_OVERHEAD_OBSTRUCTION".
Table 8.113 MARINE_ROUTE_TYPE
Change to "WATERBODY_ROUTE_TYPE".
Table 8.113 MARK_TYPE
Change to "MARINE_MARK_TYPE".
Table 8.113 NAUTICAL_GATE_TYPE
Change to "WATER_GATE_TYPE".