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

Revert "Revert "renamed and modified""