Fix further failed state names
Merge branch 'file-types' into edge