Minor TAB-2568 - Patrick Durusau
The distinction between figures and tables is not apparent, at least not to me. What you have isn't wrong but the differences in the separate numbering made it difficult for me to track across the references.
Perhaps, if time permits, making them all tables and numbering them consecutively throughout the document? Something as simple as section # - table # might work.