[refac] name adjustment