Table names now include resource name