Rename variables to match theme name