some changes in interface naming