Make function names more consistent
Support deferred unload processing