Cleanup taxonomy.
Menu names.
Merge branch 'develop'