SWITCHYARD-1394 Update module definitions