Facebook: Renaming method for normalization throughout framework + adding classes for scope