ISSUE-5134: Fixes the hard coded table prefixes.