Renamed/relocated some strings for continutity.