Revert rename

We decided to be professional and consistent after all

This reverts commits 427267c01ec53d71c412c3b825d4840b5eda386a to 86d7f82f05ab3da0399d8626d4fec5962b63b8a0