Adapt to fi-ware docummentation

Change-Id: I5679fcb270648491e7d151d5f58343e7e192b265