Rename images for consistency vis-a-vis hyphens or underscores.
Fix up references to renamed assets