Revert "Revert "Revert "renamed and modified"""
Merge pull request #121 from reviewninja/revert-120-revert-119-revert-46-test2

Revert "Revert "Revert "renamed and modified"""