fix ifdef macros
renamed