Fixed the wrong character and modified macro names to avoid conflict