modified some name problem