Revert "Rename interface name to more proper"

This reverts commit cfa6ab6b24441254d5229d92713e8cf158c21cbd.