Refactor generated actor names