Fixes pandemic naming

Fix #5817