Remove name duplication, fixes #1588