fix names to use underscores