fix dashed naming to use underscores