Rename
Fix save and update
Fix up index to use new index mechanism