Renaming the interfaces to be a more go idomatic