more fixes for 1.3.6 relating namespaces, vendor and module names