Remove hyphens from names, to support docker 0.10.0