CRAN rename fixes