Major Version

Renamed interfaces to better align with meaning