Changed figure naming