Changed variable names to plural for aggregate types