Rename tmpstorage methods and fix comments removal.