Cleanup "depiction" names