fixed duplicate identifier names