Fixed references and namespaces.