Revert some of the non literal translations for easier BC and DRYer code.
revert method rename