fixed names - we use plural for DAOs and services
added base DAOs and services