Cleaned up some unnecessary interfaces that were reduntant and rename others