Merge pull request #6 from apid/30x-apid

Change a few files to migrate GitHub repository names.