Preparing for spannables. Renaming and housekeeping.