Revert "model renaming"

This reverts commit 04b68fc3915247560dddee5052339b9a3f09e5b7.
another fix