Syncing with arnes facesconfig's bad naming convention