Finishing up class naming for Provider