Rename interface name to more proper