Adjusted Namespaces & DLL Names