Move name handling to single object type