Renaming packages according new naming