standardizing some module names
csp migrated