Replace dashes with upper cases
Remove property $path
Reorder methods