Remove dublicated entries.
Fix some naming.