* Changed underscores to hyphens.
* Committing to get backend to master branch, and to work in master branch from now on.