fix conflicting name & nick