First attempt at renaming all relevant elements