Some figures renamed