[refac] some naming changes