Revert "code review: naming and duplication smells"

This reverts commit 05b8cd895396f9a543e236d136e846e26b0e68a3.