BuddyPress.org

I assume you are talking about existing customizations, not those going forward. While it would mean an extra step for existing customizations when folks upgrade, I think the consistency makes things simpler for everyone in the long run. It is basically a little pain now to eliminate ongoing pain down the road.