use AR 4 syntax or prefix table name on some scopes (2-1-stable)

as discussed on #4225