Use underscore instead of dash for ids