Trying to resolve more name conflicts