Fix grammar
Made interface definition a named element
Updated generated code