Fixed metadata and index naming errors