Fix Naming convention v0.1.7