[BUGFIX] Fix requirements and namespaces