Make config naming more consistent