Renaming of files and functions
Revert "Renaming of files and functions"

This reverts commit 2e49421e75a775047d7e4333efc3b935f61dc08d.