add possibility to keep original name with options['name'] in store() and add tests