Renamed defines/typedef to avoid clashes with common names