rename core packages back to old naming scheme