moved all '_' to '-' for consistency