Fixed final name change