rename defines + fixes