Rename modelClass parameters to modelConstructor in Storage