we should also replace underscore on doc vars