diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index b712fb719f..091dd24ee7 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -1312,10 +1312,10 @@
 		"UploadModal": {"props": ["uploadModal", "bgScale"]},
 		"UserBadges": {"props": ["profileBadgeStaff", "profileBadgePremium"]},
 		"UserInfo": {"props": ["userInfo", "discordTag"]},
-		"UserPopout": {"props": ["headerTop", "profileBadges"]},
+		"UserPopout": {"props": ["userPopout", "rolesList"]},
 		"UserPopoutBanner": {"props": ["profileBanner", "profileBannerPremium"]},
 		"UserPopoutHeader": {"props": ["headerNormal", "avatarPositionNormal"]},
-		"UserPopoutWrapper": {"props": ["userPopout", "rolesList"]},
+		"UserPopoutInfo": {"props": ["headerTop", "profileBadges"]},
 		"UserProfile": {"props": ["topSectionNormal", "tabBarContainer"]},
 		"UserSettingsAppearancePreview": {"props": ["preview", "firstMessage"]},
 		"UserSummaryItem": {"props": ["avatarContainerMasked", "container"]},
@@ -2993,7 +2993,7 @@
 		"userbadgenitro": ["UserBadges", "profileBadgePremium"],
 		"userbadges": ["UserBadges", "container"],
 		"userbadgescolored": ["UserBadges", "colored"],
-		"userbadgespopout": ["UserPopout", "profileBadges"],
+		"userbadgespopout": ["UserPopoutInfo", "profileBadges"],
 		"userinfo": ["UserInfo", "userInfo"],
 		"userinfoavatar": ["UserInfo", "avatar"],
 		"userinfodate": ["BDFDB", "userInfoDate"],
@@ -3003,7 +3003,7 @@
 		"userinfosubtext": ["UserInfo", "subtext"],
 		"userinfotext": ["UserInfo", "text"],
 		"userinfousername": ["UserInfo", "username"],
-		"userpopout": ["UserPopoutWrapper", "userPopout"],
+		"userpopout": ["UserPopout", "userPopout"],
 		"userpopoutactivity": ["UserPopoutHeader", "activity"],
 		"userpopoutavatar": ["UserPopoutHeader", "avatar"],
 		"userpopoutavatarbase": ["UserPopoutHeader", "baseAvatar"],
@@ -3019,32 +3019,32 @@
 		"userpopoutbanner": ["UserPopoutBanner", "banner"],
 		"userpopoutbannernormal": ["UserPopoutBanner", "profileBanner"],
 		"userpopoutbannerpremium": ["UserPopoutBanner", "profileBannerPremium"],
-		"userpopoutbody": ["UserPopoutWrapper", "body"],
-		"userpopoutbodyinnerwrapper": ["UserPopoutWrapper", "bodyInnerWrapper"],
-		"userpopoutbodytitle": ["UserPopoutWrapper", "bodyTitle"],
+		"userpopoutbody": ["UserPopout", "body"],
+		"userpopoutbodyinnerwrapper": ["UserPopout", "bodyInnerWrapper"],
+		"userpopoutbodytitle": ["UserPopout", "bodyTitle"],
 		"userpopoutcustomstatus": ["UserPopoutHeader", "customStatus"],
 		"userpopoutcustomstatusemoji": ["UserPopoutHeader", "customStatusEmoji"],
 		"userpopoutcustomstatussoloemoji": ["UserPopoutHeader", "customStatusSoloEmoji"],
 		"userpopoutcustomstatustext": ["UserPopoutHeader", "customStatusText"],
-		"userpopoutendbodysection": ["UserPopoutWrapper", "endBodySection"],
-		"userpopoutfooter": ["UserPopoutWrapper", "footer"],
-		"userpopoutheaderbottag": ["UserPopout", "headerBotTag"],
-		"userpopoutheaderbottagwithnickname": ["UserPopout", "headerBotTagWithNickname"],
-		"userpopoutheaderdiscriminatorbase": ["UserPopout", "discrimBase"],
-		"userpopoutheaderdiscriminatornonickname": ["UserPopout", "headerTagDiscriminatorNoNickname"],
-		"userpopoutheadernickname": ["UserPopout", "nickname"],
+		"userpopoutendbodysection": ["UserPopout", "endBodySection"],
+		"userpopoutfooter": ["UserPopout", "footer"],
+		"userpopoutheaderbottag": ["UserPopoutInfo", "headerBotTag"],
+		"userpopoutheaderbottagwithnickname": ["UserPopoutInfo", "headerBotTagWithNickname"],
+		"userpopoutheaderdiscriminatorbase": ["UserPopoutInfo", "discrimBase"],
+		"userpopoutheaderdiscriminatornonickname": ["UserPopoutInfo", "headerTagDiscriminatorNoNickname"],
+		"userpopoutheadernickname": ["UserPopoutInfo", "nickname"],
 		"userpopoutheadernormal": ["UserPopoutHeader", "headerNormal"],
-		"userpopoutheadertag": ["UserPopout", "headerTag"],
-		"userpopoutheadertagnonickname": ["UserPopout", "headerTagNoNickname"],
-		"userpopoutheadertagusernamebase": ["UserPopout", "headerTagUsernameBase"],
-		"userpopoutheadertagusernamenonickname": ["UserPopout", "headerTagUsernameNoNickname"],
-		"userpopoutheadertagwithnickname": ["UserPopout", "headerTagWithNickname"],
-		"userpopoutheadertext": ["UserPopout", "headerText"],
-		"userpopoutheadertop": ["UserPopout", "headerTop"],
-		"userpopoutprotip": ["UserPopoutWrapper", "protip"],
+		"userpopoutheadertag": ["UserPopoutInfo", "headerTag"],
+		"userpopoutheadertagnonickname": ["UserPopoutInfo", "headerTagNoNickname"],
+		"userpopoutheadertagusernamebase": ["UserPopoutInfo", "headerTagUsernameBase"],
+		"userpopoutheadertagusernamenonickname": ["UserPopoutInfo", "headerTagUsernameNoNickname"],
+		"userpopoutheadertagwithnickname": ["UserPopoutInfo", "headerTagWithNickname"],
+		"userpopoutheadertext": ["UserPopoutInfo", "headerText"],
+		"userpopoutheadertop": ["UserPopoutInfo", "headerTop"],
+		"userpopoutprotip": ["UserPopout", "protip"],
 		"userpopoutrole": ["Role", "role"],
 		"userpopoutrolecircle": ["Role", "roleCircle"],
-		"userpopoutrolelist": ["UserPopoutWrapper", "rolesList"],
+		"userpopoutrolelist": ["UserPopout", "rolesList"],
 		"userpopoutrolename": ["Role", "roleName"],
 		"userpopoutroles": ["Role", "root"],
 		"userprofile": ["UserProfile", "root"],
@@ -3065,7 +3065,7 @@
 		"userprofiletopsectionxbox": ["UserProfile", "topSectionXbox"],
 		"userprofileusername": ["UserProfile", "username"],
 		"username": ["NameTag", "username"],
-		"usernotepopout": ["UserPopoutWrapper", "note"],
+		"usernotepopout": ["UserPopout", "note"],
 		"usernoteprofile": ["UserProfile", "note"],
 		"usernotetextarea": ["NoteTextarea", "textarea"],
 		"usersettingsappearancepreview": ["UserSettingsAppearancePreview", "preview"],