Resolved name conflict in #793