Corrected package names (namespaces)