Rename notes to nte
Merge branch 'develop'