PM|VK: fix forms for new name-space