Fixed module dependecy and add back the dinamic app name.