Updated namespaces and references to make everything compile correctly.