Fixing bugs with index by name
Initial working Index Naming