Rename variables; remove trailing semicolon.