Refactor Names from Element Stage