I think Sinango (aka Xin An) made both yeah. The Super Joy design has been knocked off a few times so it's hard to know for 100% sure who made the original, but I'm pretty sure any variant called "Power"~something on the packaging is from Sinango.
I have no idea where people are getting the name "NrTrade" from, but it sounds like probably just an export/trading company and nothing to do with actually making the thing.