Remembered to also handle name case. Re #6181