fix marco rename/location.