Rename ThemeHelper method names for clarity and to avoid confusion

As discussed in IRC