Fix in the name extraction when there's a snapshot