fix bug
Land #3913 - Change hardcoded table prefixes