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