config naming consistency and more going through tests