Updated Named Scope STI

Updated #14544 to pass Travis build.