Fixe use statements and namespaces