Rename interface/impl to better match others