Change 'model' to 'name' for query functions

We want to use model for instances of CLOS classes...