fixed macro names for static class methods.