Added more descriptive module macros.