TEIID-3110 not omitting the name in source and simplifying the various
translator calls to name in source