Matching names up
Merge pull request #393 from G5/name_adjustments

Matching names up