Rename variables and remove Wordplay object