Redefine symbols where names conflict
