Rename for theme refactor