Revert "changed some filenames"

This reverts commit 946836d7267141bf84e0674db28a3cca055a6a8e.