Revert "refactoring / name convention"

This reverts commit 58ec0878e78299f4605c3090ab77ac71e6a210a8.
Revert "Revert "refactoring / name convention""

This reverts commit ca4641bd0e1be500ae909f438c7a96d325f0ad2d.