Changed name, other fixes