rename references of configuration group to configuration based on feedback, fix breakages from merge