Refactor interface name.
general code cleanup