Updated submodules + removed target name collisions