Refactoring; changed ca namespaces.