Revert "Revert "0.04.02 Names added (Girafee)""

This reverts commit ddf5a1ae4e6c47b1ad8f2ab222028db98c5f66e5.