Updated name spaces to more modern ones