Revert "Interfaces and Implemations changing names convention"

This reverts commit b25507914756969d2883a80ae86cfc64a20f324d.
Reverting