Packets/DefaultBundle: Adjust type names (after removing unneeded types from the public interface in previous commit)