I think this is a separate implementation issue to the renaming process. These classes extend interfaces, not sure why.