Revert "Revert "Fixed some file names""

This reverts commit 044947dbf4fce81c2c1d9ffe66eade926022b4ba.