more refactor/rename