system: change B_COMMON to B_SYSTEM due to removal of common