rename pkg names and types to angulillos