adjust code related to namespace