fixed the bugs due to the change of names