Fix interface naming

This updates all the interfaces to the correct naming convention. All the unit tests are passing.