Consistent naming
For #tidyup
Simplified PURE project crawling
For #tidyup