Updated dispatcher, package.php with names