Revert "this is no longer OK"

renaming the object is still needed for templates to work OK
This reverts commit c964427b43d7728b1ccd62a458821a2fddf1830d.