Revert "Fixing naming"

This reverts commit 7d9f71d147e0c3d9f9ff9dc9c5a6115c5124bb42.