Issue #1166694 by mrf, melandren: updated module to match URs new module names and fixed schema uninstall bug