[cleanup] fix naming collision