Revert "Use dict not list to refer by name not index"

This reverts commit bbebb12baaf57810321d8f73a0578d7c05ce13ed.