Fixes inconsistent prefixing of tables of cms vs module installer

This should fix #2881 and #2882