Rename ChestTreasure and Clean up