Changed name, plus other things