Revert "I rename some files so as to be compliant with the name change from 8c9f3ddd2f49fc942b0ca95d66771cb930fd2cc1."

This reverts commit c583c1b42d27ad3a0a0a05b094ab830b82a416ef.