fix conflicting name