Renamed repeated #define definitons