Change macro names to replace divis with underscore to comply with the new allowed characters