Respecting TemplateDef names verbatim (but the extension). QueryJ compiles and passes the tests now with the strictest mode of Java 8. refs #448