Fixed bugs produced by changing names