Some renamings, mr grammar...