Default entities' names don't have underscores.

There have been some recent changes that updated the names for the
default organization and location:

* 'Default_Organization' => 'Default Organization'
* 'Default_Location' => 'Default Location'

Smoke tests have been updated accordingly.
Merge pull request #1187 from omaciel/fix-smoke

Default entities' names don't have underscores.