Refactor to allow full classname to be same as svg filename