Fix issue with license preferences being set

Also fix FIXME with renaming

Change-Id: I1ae782ac9edd51af105ac7d08e1fa30982833c43