refactor form namespaces