https://issues.jboss.org/browse/TEIID-2365 for 8.5 removed the ResolverVisitor.setFindShortName method so that we don't have to rely on static/ThreadLocal logic. Instead this value can be set via the QueryMetadataInterface method findShortName. A simple usage pattern is: QueryMetadataInterface metadata = new BasicQueryMetadataWrapper(metadata){ public boolean useOutputName() { return false; }; }; QueryResolver.resolveCommand(command, metadata); Or this could possibly integrated into your workspace metadata in an appropriate manner (considering thread-safe usage, etc.).