Multiple fixes related to library name changes, simplification of the profile xml files