Rename for new groupId and package names