handle names with indexes in 20158
Merge pull request #279 from mayabrandi/develop

handle names with indexes in 20158