Clean-up in the repository - changing names.