fixes for a composite really mapping on the actual layoutname that will
be generated as the top parent