We know that they changed all those names on PC.

This reverts commit 091a659.