Cleaned up conflicts in providers namespace. Still has tests to be ported to records