This withstands naming/renaming issues.

Follows up https://github.com/fog/fog/pull/1867

and

https://github.com/fog/fog/pull/1867#discussion_r4588518