Fixed mistaken package renamings