Fixed table names when they have a prefix defined