Deposit loading for both new and old format
Renaming and miscellaneous cleanup