handle names with indexes in 20158