Fixed figure names