Finished with name changes

These files had their names changed, but have not been tested
with a non-dev compile yet.