Restrict catalog name changes to catalog code
Things now use catalog library
Allow any subsystem to be loaded