Cleaned up the names of the interfaces