removing dashes from key/group names, since it causes problems on GCE