style: Remove readability-identifier-naming where not needed (#2962)

style: Remove readability-identifier-naming where not needed (#2962) #2408