Rename funny variables