Revert "better file naming"

This reverts commit 615e0875e4d255dc307f3f34fb7bb9acc5ab9a81.
better file naming