Fixed duplicated name problem