Removed all anon namespace references