Fixed for the new optimized module names