Revert to old capitalization to avoid git issues (#8942)
    
Git on OS X seems to have problems with changing between branches with
the old and new casing of the two json related files. Changing back to
the old names to avoid issues when changing branches.
    
Change-Id: I948395a7ce725db4116fe0e7ac1a23628dc659c7