Rename Should Be Complete

[Dave Fisher]

Hi -

Please check that all the renaming is complete: 
https://issues.apache.org/jira/browse/INFRA-26531

Best,
Dave