Merge "Change interface name to be more suitable"