fixed duplicate names