changed references to interfaces to models