Switched name to index