naming cleanup, confirmed most core nodes load