Revert "moving to _ for names instead of -.  I think docker 1.0 dislikes hyphens?"

Lies.

This reverts commit 08cd7637afe38dd4a032672d9289fdcaaa17c910.
deprecation warnings