refactored func/struct/interface names