Update module names, tracking master