Repository name change, some cleanup