Removed underscores between macros, added dial function in yellow page module.