Change to name without underscores and add figures