Add naming utility
Rename file for fix naming problem
Fix naming problem
Merge pull request #83 from eroshenkoam/master

#81: Add naming utility