Un-renaming intermediate models to work around Django bug: