made namespaces consistent
Made sure things were added