Rename tmp -> temp
Upgrade for new Object wrapper