Updated role names in submodules