Rename sol004 and sol007 packages and updated package names