removed some strange pluralization of variable names