Extract Inject DSL from Predef, rename methods, close #1399