Replace hyphens with underscores

Change hyphens to underscores, e.g. data-url -> data_url so we can use these directly as python keywords.