Changed from underscores to hyphens