U: fixed #1, rename nameStorage to name-storage.