Clean up a few repo names