Updating fixtures and some other places to reflect the namespace change