all occurences of Sonoff-Tasmota changed to Tasmota

AWS-IoT.md

@@ -72,7 +72,7 @@ If you don't have already one, just follow the guide: https://aws.amazon.com/pre
 
 You will need to install/compile the following:
 
- * Complete environment to compile Tasmota, ex: PlatformIO (https://github.com/arendst/Sonoff-Tasmota/wiki/PlatformIO)
+ * Complete environment to compile Tasmota, ex: PlatformIO (https://github.com/arendst/Tasmota/wiki/PlatformIO)
  * Recent version of `openssl`
 
 ### Step 1.5 Deploy required resources using AWS CloudFormation and skip to Step 6.

Adding-new-Module-types.md

@@ -4,7 +4,7 @@ Before you add a new module type, you can try using the module type "Generic" ov
 
 Generic Module was added in v5.12.0, before that version its called "Wemos D1 Mini".
 
-Check the [Other Devices Page](https://github.com/arendst/Sonoff-Tasmota/wiki/Other-Devices) for more infos and other Devices with ESP.
+Check the [Other Devices Page](https://github.com/arendst/Tasmota/wiki/Other-Devices) for more infos and other Devices with ESP.
 
 ***
 

Arduino-IDE.md

@@ -1,6 +1,6 @@
 ## Arduino IDE is not recommended to use for compiling Tasmota firmware.
 
-_**Use [Gitpod](https://github.com/arendst/Sonoff-Tasmota/wiki/Compiling-Tasmota-on-Gitpod) or [VSC with PlatformIO](https://github.com/arendst/Sonoff-Tasmota/wiki/Visual-Studio-Code) to compile the firmware. Setup is much easier for these IDEs. The Tasmota project is already configured for them.**_
+_**Use [Gitpod](https://github.com/arendst/Tasmota/wiki/Compiling-Tasmota-on-Gitpod) or [VSC with PlatformIO](https://github.com/arendst/Tasmota/wiki/Visual-Studio-Code) to compile the firmware. Setup is much easier for these IDEs. The Tasmota project is already configured for them.**_
 
 ## Arduino IDE setup and configuration for Tasmota compilation and upload
 

Armtronix-Dimmers.md

@@ -1,6 +1,6 @@
 There is a small company making dimmers in about the same formfactor as a sonoff dual and single. These [Single](https://www.tindie.com/products/Armtronix/wifi-ac-dimmer-esp8266-one-triac-board-alexaecho/) and [Dual](https://www.tindie.com/products/Armtronix/wifi-ac-dimmer-two-triac-board/) dimmer boards have open source firmware. 
 
-***Supported since version [6.4.0](https://github.com/arendst/Sonoff-Tasmota/pull/4321) as ARMTR Dimmer (56)*** 
+***Supported since version [6.4.0](https://github.com/arendst/Tasmota/pull/4321) as ARMTR Dimmer (56)*** 
 
 ## Hardware
 The dimmers contain an ESP8266 for the wifi connection and an Atmega328 which monitors the mains frequency and dimm the lights using a triac and phase controlled dimming. Communication between the two is done using the serial port at 115200 baud. The dimmers contain extra connections (pin headers) for a 10K potentiometer. When this one is connected you get 10 step dimming of the lights which overrides the tasmota dimm level. This feature also works when the Tasmota firmware is non-functional, so it is nice as a fail safe feature. The setting of the potentiometer is fed back to the Tasmota firmware, so when the potentiometer dimmer is turned and the Tasmota setting overridden, the value in the Tasmota channel is representable of the dimmer value. 

BME280-Temperature,-Humidity-and-Pressure-Sensor-and-Sonoff-Basic-with-Tasmota.md

@@ -1,6 +1,6 @@
 "BME280 sensor, an environmental sensor with temperature, barometric pressure and humidity", [see Datasheet.](https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BME280_DS002.pdf)
 
-## Connect BME280 to Sonoff-Basic [based on the GPIO locations](https://github.com/arendst/Sonoff-Tasmota/wiki/Sonoff-Basic#gpio-locations)
+## Connect BME280 to Sonoff-Basic [based on the GPIO locations](https://github.com/arendst/Tasmota/wiki/Sonoff-Basic#gpio-locations)
 
 * BME280-3.3V -> Sonoff-3.3V
 * BME280-GND -> Sonoff-GND

Beginner-Guide---Create-your-own-Firmware-Build.md

@@ -27,7 +27,7 @@ You got Atom with Platform.io ready now.
 ## Building the firmware
 First you need to get the Source files from Github.
 
-Go to the [Code Page](https://github.com/arendst/Sonoff-Tasmota/tree/development).
+Go to the [Code Page](https://github.com/arendst/Tasmota/tree/development).
 
 Now you can change the Branch(1). I suggest you to use the development Branch.
 

BlitzWolf-BW-SHP4-(UK-Version).md

@@ -2,7 +2,7 @@
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 MAKE SURE YOU DON'T HAVE IT PLUGGED IN WHEN DOING ANY OF THIS INCLUDING FLASHING - YOU HAVE BEEN WARNED.
 

BlitzWolf-SHP2.md

@@ -23,7 +23,7 @@ This method does't need any wiring.
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 
 ### Step 1.
@@ -38,7 +38,7 @@ Solder cables to the ESP Pins
 ![soldered cables](https://user-images.githubusercontent.com/25499089/43945387-358d35c2-9c82-11e8-8031-27754090e50c.jpg)
 ### Step 3.
 :warning: :warning: :warning:  
-For version 2.3 and 2.4, see: https://github.com/arendst/Sonoff-Tasmota/wiki/Gosund-SP1
+For version 2.3 and 2.4, see: https://github.com/arendst/Tasmota/wiki/Gosund-SP1
 ![shortwire during startup](https://user-images.githubusercontent.com/644662/48127131-4326a780-e283-11e8-93ef-acc7b94650d2.png).  
 :warning: :warning: :warning:  
 
@@ -121,4 +121,4 @@ sensor:
 ```
 
 ## Attention
-There is a [newer hardware revision (v2.3)](https://github.com/arendst/Sonoff-Tasmota/issues/4303) which is supported too. Use latest release. See also https://github.com/arendst/Sonoff-Tasmota/wiki/Gosund-SP1
+There is a [newer hardware revision (v2.3)](https://github.com/arendst/Tasmota/issues/4303) which is supported too. Use latest release. See also https://github.com/arendst/Tasmota/wiki/Gosund-SP1

BlitzWolf-SHP6.md

@@ -7,11 +7,11 @@ Product page:
 - [Gosund SP111](https://www.gosund.store/)  
 
 Device needs exact calibration with a load >=60 Watt to gain good results!
-For further infos see [Issue #4727](https://github.com/arendst/Sonoff-Tasmota/issues/4727)
+For further infos see [Issue #4727](https://github.com/arendst/Tasmota/issues/4727)
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 ### Step 1
 **Disconnect device from power source!**

Builds.md

@@ -2,7 +2,7 @@ There are many available features programmed into Tasmota. Not all devices need
 
 Many times one just needs to download a pre-compiled binary and perform the necessary run-time configuration. It is not necessary to compile your own binary if these pre-compiled builds meet your needs. These available files provide a simpler approach to get up and going with Tasmota quickly.
 
-The binary files available on [GitHub](https://github.com/arendst/Sonoff-Tasmota/releases) are for the current master release version only. These master release binaries are also available from the [OTA server](http://thehackbox.org/tasmota/release/). However, the latest development branch code binaries are only available from the [OTA server](http://thehackbox.org/tasmota/).
+The binary files available on [GitHub](https://github.com/arendst/Tasmota/releases) are for the current master release version only. These master release binaries are also available from the [OTA server](http://thehackbox.org/tasmota/release/). However, the latest development branch code binaries are only available from the [OTA server](http://thehackbox.org/tasmota/).
 
 Features that are not available in any release build have to be enabled in source code and compiled yourself. Read more about [compiling your own build](compile-your-build).
 

Commands.md

@@ -1,25 +1,25 @@
-- [How to Use Commands](#how-to-use-commands)
+#### [How to Use Commands](#how-to-use-commands)
-    - [Control](#control)
+- [Control](#control)
-    - [Management](#management)
+- [Management](#management)
-    - [Wi-Fi](#wi-fi)
+- [Wi-Fi](#wi-fi)
-    - [MQTT](#mqtt)
+- [MQTT](#mqtt)
-    - [Rules](#rules)
+- [Rules](#rules)
-    - [Timers](#timers)
+- [Timers](#timers)
-    - [Sensor](#sensor)
+- [Sensor](#sensor)
-    - [Power Monitoring](#power-monitoring)
+- [Power Monitoring](#power-monitoring)
-    - [Light](#light)
+- [Light](#light)
-    - [Sonoff RF Bridge](#sonoff-rf-bridge)
+- [Sonoff RF Bridge](#sonoff-rf-bridge)
-    - [IR Remote](#ir-remote)
+- [IR Remote](#ir-remote)
-    - [SetOption overview](#setoption-overview)
+- [SetOption overview](#setoption-overview)
-    - [Serial Bridge](#serial-bridge)
+- [Serial Bridge](#serial-bridge)
-    - [mp3-player](#mp3-player)
+- [mp3-player](#mp3-player)
-    - [Domoticz](#domoticz)
+- [Domoticz](#domoticz)
-    - [KNX](#knx)
+- [KNX](#knx)
-    - [Displays](#displays)
+- [Displays](#displays)
-    - [Stepper Motors](#stepper-motors)
+- [Stepper Motors](#stepper-motors)
-    - [Blinds, Shutters and Roller Shades](#blinds-shutters-and-roller-shades)
+- [Blinds, Shutters and Roller Shades](#blinds-shutters-and-roller-shades)
 
-The Sonoff-Tasmota firmware provides three powerful man machine interfaces:<BR>**MQTT**, **web** and **serial**.
+Tasmota provides three powerful man machine interfaces:<BR>**MQTT**, **web** and **serial**.
 
 ### Sending commands with MQTT
 
@@ -262,7 +262,7 @@ CounterType\<x\><a id="CounterType"></a>|`0` = set Counter\<x\> as pulse Counter
 HumRes<a id="HumRes"></a>|Humidity sensor resolution<BR>`0..3` = maximum number of decimal places
 PressRes<a id="PressRes"></a>|Pressure sensor resolution<BR>`0..3` = maximum number of decimal places
 Sensor13<a id="Sensor13"></a>|[INA219](http://www.ti.com/product/INA219) low voltage current sensor calibration mode<BR>`0` = set INA219 calibration to max 32V and 2A<BR>`1` = set INA219 calibration to max 32V and 1A<BR>`2` = set INA219 calibration to max 16V and 0.4A
-Sensor15<a id="Sensor15"></a>|[Automatic Baseline Correction](https://github.com/arendst/Sonoff-Tasmota/blob/c97ea4d9176eb7e87abff5f963a0f1c60f0a5e52/sonoff/xsns_15_mhz19.ino#L47) for [MH-Z19B](MH-Z19B) CO<sub>2</sub> sensor<BR>`0` = disabled<BR>`1` = enabled *(default)*<BR>`2` = disable and start manual calibration from 400 ppm of CO<sub>2</sub><BR>`9` = reset sensor to factory defaults<BR>`1000` = sets measurement range to 1000ppm CO<sub>2</sub><BR>`2000` = sets measurement range to 2000ppm CO<sub>2</sub><BR>`3000` = sets measurement range to 3000ppm CO<sub>2</sub><BR>`5000` = sets measurement range to 5000ppm CO<sub>2</sub>
+Sensor15<a id="Sensor15"></a>|[Automatic Baseline Correction](https://github.com/arendst/Tasmota/blob/c97ea4d9176eb7e87abff5f963a0f1c60f0a5e52/sonoff/xsns_15_mhz19.ino#L47) for [MH-Z19B](MH-Z19B) CO<sub>2</sub> sensor<BR>`0` = disabled<BR>`1` = enabled *(default)*<BR>`2` = disable and start manual calibration from 400 ppm of CO<sub>2</sub><BR>`9` = reset sensor to factory defaults<BR>`1000` = sets measurement range to 1000ppm CO<sub>2</sub><BR>`2000` = sets measurement range to 2000ppm CO<sub>2</sub><BR>`3000` = sets measurement range to 3000ppm CO<sub>2</sub><BR>`5000` = sets measurement range to 5000ppm CO<sub>2</sub>
 Sensor20<a id="Sensor20"></a>|[Nova Fitness SDS011](Wemos-D1-Mini-and-Nova-Fitness-SDS011-Laser-Dust-Sensor) dust sensor.&emsp;  »6.5.0.3<BR>1..255` = number of seconds before TelePeriod to poll the sensor
 Sensor27<a id="Sensor27"></a>|[APDS-9960](APDS-9960) sensor commands<BR>`0` = enable light level and proximity sensor / disable gestures *(default)* <BR> `1` = enable gesture mode/ disable light level and proximity sensor<BR> `2` = enable gestures with half gain / disable light and proximity sensor<BR>`3..255` = Set [ATIME register](APDS-9960#known-issues) for different integration times
 Sensor29<a id="Sensor29"></a>|MCP23008 / MCP23017 I<sup>2</sup>C GPIO Expander configuration ([additional details](MCP23008-MCP23017))<BR>`Reset<x>` = reset all pins<BR>x = `1..6`<BR>`1` = INPUT mode, no reporting, no pull-up<BR>`2` = INPUT mode, report on CHANGE, pull-up enabled<BR>`3` = INPUT mode, report on LOW, pull-up enabled<BR>`4` = INPUT mode, report on HIGH, pull-up enabled<BR>`5` = OUTPUT mode (if enabled by `#define USE_MCP230xx_OUTPUT`)<BR>`6` = inverted OUTPUT mode (if enabled by `#define USE_MCP230xx_OUTPUT`)<BR><BR>`pin,pinmode{,intpullup\|outstate{,repmode}}`<br>[Continue reading...](MCP23008-MCP23017#device-configuration)
@@ -364,7 +364,7 @@ A [specialized version of Tasmota](Tasmota-IR) can be compiled which supports al
 :---|:---
 IRsend`<x>`<a id="IRsend"></a>|Send an IR remote control code as a decimal or hexadecimal string in a JSON payload. In order to send IR data, _**you must configure one of the free device GPIO as `IRsend (8)`. GPIO01 nor GPIO03 can be used.**_<BR>`<x>` [_optional_] = number of times the IR message is sent. If not specified or `0..1`, the message is sent only once (i.e., not repeated) _(default)_<BR>`>1` = emulate a long-press on the remote control, sending the message `<x>` times, or sending a repeat message for specific protocols (like NEC)<BR><BR>`{"Protocol":"<value>","Bits":<value>,"Data":<value>}`<BR><BR>`"Protocol"` (select one of the following):<ul><li>`"NEC"`</li><li>`"SONY"`</li><li>`"RC5"`</li><li>`"RC6"`</li><li>`"DISH"`</li><li>`"JVC"`</li><li>`"PANASONIC"`</li><li>`"SAMSUNG"`</li><li>`"PIONEER"`</li></ul>`"Bits":1..32` = required number of data bits<BR>&nbsp;&nbsp;&nbsp;&nbsp;for PANASONIC protocol this parameter is the the address, not the number of bits<BR><BR>`"Data":1..(2^32)-1` = data frame as 32 bit decimal.<BR>&nbsp;&nbsp;&nbsp;&nbsp;e.g., `IRsend {"Protocol":"NEC","Bits":32,"Data":2170978686}`<BR>**or**<BR>`"Data":0x1..0xFFFFFFFF` = data frame as 32 bit hexadecimal.<BR>&nbsp;&nbsp;&nbsp;&nbsp;e.g., `IRsend {"Protocol":"NEC","Bits":32,"Data":0x8166817E}`<BR><BR>Alternatively, you can send IR remote control codes using [RAW command encoding](IRSend-RAW-Encoding).<BR><BR>Information on [Receiving Infrared Data](Receiving-Infrared-Remote-Control-Data)
 IRhvac<a id="IRhvac"></a>|Send HVAC IR remote control code as JSON payload<Br>`{"Vendor":"<value>","Power":<value>,"Mode":”<value>”, "FanSpeed":”<value>”,"Temp":<value>}`<BR>`"Vendor":"Toshiba"\|"Mitsubishi"\|"LG"\|"Fujitsu"`<BR>`"Power":0\|1`<BR>`"Mode":"Hot"\|"Cold"\|"Dry"\|"Auto"`<BR>`"FanSpeed":"1"\|"2"\|"3"\|"4"\|"5"\|"Auto"\|"Silence"` <BR>`"Temp":17..30`
-|See also|[`SetOption29`](#SetOption29)  - Set IR received data format<BR>[`SetOption38`](#SetOption38)  - Set IR received protocol sensitivity<BR>[`SetOption58`](#SetOption58) - [IR Raw data in JSON payload](https://github.com/arendst/Sonoff-Tasmota/issues/2116#issuecomment-440716483)
+|See also|[`SetOption29`](#SetOption29)  - Set IR received data format<BR>[`SetOption38`](#SetOption38)  - Set IR received protocol sensitivity<BR>[`SetOption58`](#SetOption58) - [IR Raw data in JSON payload](https://github.com/arendst/Tasmota/issues/2116#issuecomment-440716483)
 
 ### SetOption overview
 
@@ -409,10 +409,10 @@ SetOption54<a id="SetOption54"></a>|Apply [`SetOption20`](#SetOption20) settings
 SetOption55<a id="SetOption55"></a>|mDNS service&emsp;  »6.4.1.4<BR>`0` = disable *(default)* <BR> `1` = enable
 SetOption56<a id="SetOption56"></a>|Wi-Fi network scan to select strongest signal on restart (network has to be visible)&emsp;  »6.3.0.10<BR>`0` = disable *(default)*<BR> `1` = enable
 SetOption57<a id="SetOption57"></a>|Wi-Fi network re-scan every 44 minutes with alternate to +10dB stronger signal if detected (only visible networks)&emsp;  »6.3.0.10<BR>`0` = disable *(default)*<BR> `1` = enable
-SetOption58<a id="SetOption58"></a>|[IR Raw data in JSON payload](https://github.com/arendst/Sonoff-Tasmota/issues/2116#issuecomment-440716483)&emsp;  »6.3.0.11<BR>`0` = disable *(default)*<BR> `1` = enable
+SetOption58<a id="SetOption58"></a>|[IR Raw data in JSON payload](https://github.com/arendst/Tasmota/issues/2116#issuecomment-440716483)&emsp;  »6.3.0.11<BR>`0` = disable *(default)*<BR> `1` = enable
 SetOption59<a id="SetOption59"></a>|Send `tele/%topic%/STATE` in addition to `stat/%topic%/RESULT` for commands: [`State`](#State), [`Power`](#Power) and any command causing a light to be turned on.&emsp;  »6.3.0.13<BR>`0` = disable *(default)*<BR> `1` = enable
 SetOption60<a id="SetOption60"></a>|Enable normal sleep instead of [dynamic sleep](Dynamic%20Sleep)&emsp;  »6.3.0.15<BR> `0` = dynamic sleep *(default)*<BR> `1` = sleep
-SetOption61<a id="SetOption61"></a>|Force [local operation](https://github.com/arendst/Sonoff-Tasmota/pull/4562#issuecomment-446230001) when [`ButtonTopic`](#ButtonTopic) or [`SwitchTopic`](#SwitchTopic) is set.&emsp;  »6.3.0.16<BR>`0` = disable *(default)*<BR> `1` = enable
+SetOption61<a id="SetOption61"></a>|Force [local operation](https://github.com/arendst/Tasmota/pull/4562#issuecomment-446230001) when [`ButtonTopic`](#ButtonTopic) or [`SwitchTopic`](#SwitchTopic) is set.&emsp;  »6.3.0.16<BR>`0` = disable *(default)*<BR> `1` = enable
 SetOption62<a id="SetOption62"></a>|Set retain on Button or Switch hold messages&emsp;  »6.4.1.19<BR>`0` = disable *(default)*<BR> `1` = don't use retain flag on `HOLD` messages
 SetOption63<a id="SetOption63"></a>|Set relay state feedback scan at restart ([#5594](../issues/5594), [#5663](../issues/5663))&emsp;  »6.5.0.9<BR>`0` = Scan relay power feedback state at restart *(default)*<BR> `1` = Disable relay power feedback state scanning at restart
 SetOption64<a id="SetOption64"></a>|Switch between `-` or `_` as sensor name separator&emsp;  »6.5.0.12<BR>`0` = sensor name index separator is `-` _(hyphen)_ *(default)*<BR> `1` = sensor name index separator is `_` _(underscore)_<br>*Affects DS18X20, DHT, BMP and SHT3X sensor names in tele messages*
@@ -425,7 +425,7 @@ SetOption71<a id="SetOption71"></a>|Set DDS238 Modbus register for active energy
 SetOption72<a id="SetOption72"></a>|Set reference used for total energy &emsp;  »6.6.0.15<BR>`0` = use firmware counter *(default)*<BR>`1` = use energy monitor (e.g., PZEM-0xx, SDM120, SDM630, DDS238, DDSU666) hardware counter
 SetOption73<a id="SetOption73"></a>|Set HTTP Cross-Origin Resource Sharing (CORS) &emsp;  »7.0.0.1<BR>`0` = disable CORS *(default)*<BR>`1` = enable CORS
 SetOption74<a id="SetOption74"></a>|Enable internal pullup for single DS18x20 sensor &emsp;  »7.0.0.1<BR>`0` = disabled *(default)*<BR>`1` = internal pullup enabled
-SetOption75<a id="SetOption75"></a>|Set grouptopic behaviour ([#6779](https://github.com/arendst/Sonoff-Tasmota/issues/2116))&emsp;  »7.0.0.1<BR>`0` = GroupTopic using FullTopic replacing %topic% _(default)_<BR>`1` =  GroupTopic is `cmnd/%grouptopic%/` 
+SetOption75<a id="SetOption75"></a>|Set grouptopic behaviour ([#6779](https://github.com/arendst/Tasmota/issues/2116))&emsp;  »7.0.0.1<BR>`0` = GroupTopic using FullTopic replacing %topic% _(default)_<BR>`1` =  GroupTopic is `cmnd/%grouptopic%/` 
 SetOption80<a id="SetOption80"></a>|[Blinds and shutters](blinds-and-shutters) support&emsp;  »6.6.0.14<BR>`0` = disable blinds and shutters support *(default)*<BR>`1` = enable blinds and shutters support
 SetOption81<a id="SetOption81"></a>|Set PCF8574 component behavior for all ports&emsp;  »6.6.0.14<BR>`0` = set as regular state *(default)*<BR>`1` = set as inverted state
 

Configuration-Procedure-for-New-Devices.md

@@ -22,7 +22,7 @@ If your device is similar to the existing built-in module (e.g., a particular MC
 
    _c._ Once you have found which GPIO are connected to each input, change the GPIO setting in the configuration to a `Button<x>` or `Switch<x>` according to your input component or use case. Proper operation may dictate the use regular or inverted (i.e., `Switch<x>i`/`Button<x>i`) settings. For buttons, you may need to determine whether the internal pull-up is used or not. If so, select `Button<x>`_**n**_, where _**n**_ indicates no pull-up.
 
-      - See [Using a physical pushbutton with single press, double press, and hold](https://github.com/arendst/Sonoff-Tasmota/wiki/Rule-cookbook#16-using-an-external-button-with-single-press---double-press-and-hold) to control multiple devices with one button.
+      - See [Using a physical pushbutton with single press, double press, and hold](https://github.com/arendst/Tasmota/wiki/Rule-cookbook#16-using-an-external-button-with-single-press---double-press-and-hold) to control multiple devices with one button.
 
 3. Once you have determined which GPIO your device uses, set any remaining GPIO to `None`.
 
@@ -30,6 +30,6 @@ If your device is similar to the existing built-in module (e.g., a particular MC
 
 4. Once the device reboots, your device hardware is configured for use.
 
-5. Since you have now configured a device not previously known to the TASMOTA user base, you may want to [export the template](https://github.com/arendst/Sonoff-Tasmota/wiki/Templates#exporting-your-template) and contribute it to the [templates database](https://blakadder.github.io/templates/).
+5. Since you have now configured a device not previously known to the TASMOTA user base, you may want to [export the template](https://github.com/arendst/Tasmota/wiki/Templates#exporting-your-template) and contribute it to the [templates database](https://blakadder.github.io/templates/).
 
 View this [Digiblur DIY video](https://youtu.be/5Oa27pCHtYo?t=518) for a tutorial on this procedure. 

Control-other-devices.md

@@ -22,6 +22,6 @@ setoption11 1
 ```
 
 Taken from the discussion:
-[https://github.com/arendst/Sonoff-Tasmota/issues/200#issuecomment-343756826](https://github.com/arendst/Sonoff-Tasmota/issues/200#issuecomment-343756826)
+[https://github.com/arendst/Tasmota/issues/200#issuecomment-343756826](https://github.com/arendst/Tasmota/issues/200#issuecomment-343756826)
 
-[Example using Rules](https://github.com/arendst/Sonoff-Tasmota/wiki/Rule-cookbook#16-using-an-external-button-with-single-press---double-press-and-hold)
+[Example using Rules](https://github.com/arendst/Tasmota/wiki/Rule-cookbook#16-using-an-external-button-with-single-press---double-press-and-hold)

Create-your-own-Firmware-Build-without-IDE.md

@@ -179,7 +179,7 @@ PlatformIO seems to handle the rebuilds and dependencies well, but if you want a
 The result will be here: `./.pioenvs/<build-flavour>/firmware.bin`
 
 ```
-(platformio-core) [tasmota_builder@jtest Sonoff-Tasmota]$ find .pioenvs -name '*.bin'
+(platformio-core) [tasmota_builder@jtest Tasmota]$ find .pioenvs -name '*.bin'
 .pioenvs/tasmota-FR/firmware.bin
 .pioenvs/tasmota-GR/firmware.bin
 .pioenvs/tasmota-HE/firmware.bin

Dimmer-switch-with-Nuvoton-chip.md

@@ -1,4 +1,4 @@
-A generic touch dimmer flashed with [Tasmota](https://github.com/arendst/Sonoff-Tasmota).
+A generic touch dimmer flashed with [Tasmota](https://github.com/arendst/Tasmota).
 
 On AliExpress you can buy a wifi dimmer for mains voltage (110 or 220V) It's a brandles dimmer, but can be found here: [AliExpress page](http://www.aliexpress.com/item/Led-Dimmer-220v-Smart-Wifi-Switch-Touch-Control-Stepless-Dimmer-With-Bulb-Compatible-With-Amazon-Alexa/32891383747.html?spm=a2g0s.9042311.0.0.300d4c4dx6emz1)
 
@@ -42,7 +42,7 @@ RX    to   RX  (due to the fact the silkscreen is wrong, otherwise, RX connects
 TX    to   TX  
 SW    to   GND  -- only during power up, to put the ESP in programming mode.
 
-From here the upload is the same as for all other Tasmota devices. See the [Tasmota page](https://github.com/arendst/Sonoff-Tasmota/wiki/Upload) for detailed info.
+From here the upload is the same as for all other Tasmota devices. See the [Tasmota page](https://github.com/arendst/Tasmota/wiki/Upload) for detailed info.
 
 **Note:** sonoff basic and classic variants do not support the serial bridge. To get this working you should use the standard sonoff.bin - NOT basic or classic.
 
@@ -61,7 +61,7 @@ Keep in mind, the dimmer itself needs a Neutral wire as well. If you replace an
 ## First connection
 
 When you first power up the dimmer switch, it comes up in AccessPoint mode.
-Follow the instructions [here](https://github.com/arendst/Sonoff-Tasmota/wiki/Initial-Configuration) 
+Follow the instructions [here](https://github.com/arendst/Tasmota/wiki/Initial-Configuration) 
 
 ## Set correct module type
 

Domoticz---Automatic-discovery.md

@@ -13,15 +13,15 @@ Configure Domoticz MQTT Discovery plugin.
 - On the hardware page add Type ```MQTT Discovery```
     1. Give it a name, e.g. ```Sonoff```
     2. Configure the interface with access to your MQTT server (```MQTT Server Address```, ```Port```, ```Username``` and ```Password```)
-    3. Set the ```Discovery topic``` to ```homeassistant``` unless it has been changed in a custom Sonoff-Tasmota build
+    3. Set the ```Discovery topic``` to ```homeassistant``` unless it has been changed in a custom Tasmota build
-    4. Set the ```Ignored device topic``` to ```tasmota/sonoff/``` to avoid unconfigured Sonoff-Tasmota devices from being discoved
+    4. Set the ```Ignored device topic``` to ```tasmota/sonoff/``` to avoid unconfigured Tasmota devices from being discoved
 
-## Sonoff-Tasmota (official binary)
+## Tasmota (official binary)
-- Each Sonoff-Tasmota device must have it's own topic, the easiest way is to set topic to ```sonoff_%06X``` (%06X will be replaced by MAC address). See point 5 [here](Initial-Configuration) for how to set the topic.
+- Each Tasmota device must have it's own topic, the easiest way is to set topic to ```sonoff_%06X``` (%06X will be replaced by MAC address). See point 5 [here](Initial-Configuration) for how to set the topic.
 - Use MQTT or Serial or Web console and execute commands (replace ```<sonoff_MAC>``` with the device's unique topic)
     1. ```cmnd/<sonoff_MAC>/SetOption19``` with payload ```1``` to enable MQTT discovery
 
-## Sonoff-Tasmota (custom binary)
+## Tasmota (custom binary)
 - The above settings can be defined in user_config_override.h (TBD)
 
 ## Usage    

Domoticz.md

@@ -2,7 +2,7 @@
 
 Sonoff supports [Domoticz](http://www.domoticz.com/) MQTT 'out of the box' for both relays and sensors.
 
-Find below the procedure to configure Domoticz and Sonoff-Tasmota.
+Find below the procedure to configure Domoticz and Tasmota.
 
 ## Prerequisites
 The following servers should be made available:
@@ -29,7 +29,7 @@ Make a new virtual switch and remeber its Idx number.
 2. On the Devices page find the new switch by it's name
     1. Remember it's Idx number
 
-## Sonoff-Tasmota
+## Tasmota
 <img alt="Sonoff" src="https://github.com/arendst/arendst.github.io/blob/master/media/domoticz3.jpg" width="250" align="right" /> 
 Sonoff provides different ways to configure Domoticz parameters. Choose the method you prefer:
 

Dynamic-Sleep.md

@@ -2,7 +2,7 @@
 
 SetOption60 may be used to configure your device to use Normal Sleep or Dynamic Sleep.
 
-Dynamic Sleep is enabled by default from Sonoff-Tasmota version 6.3.0.15 but may be reconfigured by setting the value of SetOption60 accordingly.
+Dynamic Sleep is enabled by default from Tasmota version 6.3.0.15 but may be reconfigured by setting the value of SetOption60 accordingly.
 
 Command       | Description
 --------------|---------------------------------------------------------------------------
@@ -11,9 +11,9 @@ SetOption60 1 | Normal Sleep is ENABLED
 
 The term CPU is used loosely here for the sake of making it easier to understand - When the term CPU is used it is actually referring to the ESP8266 SoC Micro Controller.
 
-With the introduction of many new drivers, sensors and other functions as part of the Sonoff-Tasmota firmware, it has become more important to pay specific attention to the amount of microcontroller clock cycles shared with the underlying SDK/Arduino ESP8266 Core.
+With the introduction of many new drivers, sensors and other functions as part of the Tasmota firmware, it has become more important to pay specific attention to the amount of microcontroller clock cycles shared with the underlying SDK/Arduino ESP8266 Core.
 
-The main application loop of the Sonoff-Tasmota firmware needs to visit each of the driver callbacks within the main loop to make sure all the required drivers and sensors receive the necessary processing time whilst ensuring that the main loop does not overwhelm the need for processing time by the SDK / Arduino ESP8266 core.
+The main application loop of the Tasmota firmware needs to visit each of the driver callbacks within the main loop to make sure all the required drivers and sensors receive the necessary processing time whilst ensuring that the main loop does not overwhelm the need for processing time by the SDK / Arduino ESP8266 core.
 
 The highest priority drivers/sensors need to be called once per 50ms to operate as designed but most of the normal run of the mill drivers and sensors do not necessarily require this amount of intense polling. The 50-millisecond mark would normally be considered to be an absolute minimum duty cycle for the main processing loop on ESP8266 boards whilst most Sonoff device derivatives will function perfectly well way above this default setting.
 
@@ -21,9 +21,9 @@ To make this manageable from device to device a new setting has been introduced
 
 For default operation, this will be set to 50 milliseconds as there are generally no drivers or sensors that need to be polled at a rate higher than this.
 
-To allow for power usage flexibility this value may also be increased to a value of up to 250 milliseconds which is very useful to reduce power and processing demand on non-time critical devices such as switches (which is what most of Sonoff-Tasmota is used for.)
+To allow for power usage flexibility this value may also be increased to a value of up to 250 milliseconds which is very useful to reduce power and processing demand on non-time critical devices such as switches (which is what most of Tasmota is used for.)
 
-The purpose of this setting is to allow you as a user to set the speed at which driver and sensors will be serviced and as a result also the amount of time given to the SDK / Arduino ESP8266 core to handle its background tasks (which are not under direct control of the Sonoff-Tasmota firmware.)
+The purpose of this setting is to allow you as a user to set the speed at which driver and sensors will be serviced and as a result also the amount of time given to the SDK / Arduino ESP8266 core to handle its background tasks (which are not under direct control of the Tasmota firmware.)
 
 ### Example Use Case
 
@@ -61,7 +61,7 @@ Variable  | Value   | Description
 SleepMode | Normal  | Normal Sleep mode is enabled (SetOption60 = 1)
 SleepMode | Dynamic | Dynamic Sleep mode is enabled (SetOption60 = 0)
 Sleep     | 50      | Current setting for sleep
-LoadAvg   | 19      | Reported % time of Sleep spent doing Sonoff-Tasmota main loop processing
+LoadAvg   | 19      | Reported % time of Sleep spent doing Tasmota main loop processing
 
 In this example, 19% of 50 milliseconds would be 9.5 milliseconds (19/100*50), so we can see
 that there is sufficient headroom for the SDK / ESP8266 Arduino Core to do its background
@@ -69,7 +69,7 @@ work.
 
 On some devices which have many sensors connected you may observe the LoadAvg value exceeding 100 - This means that you have not set the value of sleep high enough to accommodate all the sensors and drivers which need to be serviced.
 
-In the latter case, you have two options - either increase the value of sleep to a higher one to maintain a load average well below 100 or use multiple devices to spread the load across separate Sonoff-Tasmota powered devices/boards.
+In the latter case, you have two options - either increase the value of sleep to a higher one to maintain a load average well below 100 or use multiple devices to spread the load across separate Tasmota powered devices/boards.
 
 For the most part, all Sonoff based products should perform well balanced with the default setting of 50 for sleep.
 

ERC309-Kinetic-Switch.md

@@ -1,6 +1,6 @@
 ![](https://user-images.githubusercontent.com/25117255/61148426-0e888100-a4df-11e9-92c5-43453afcc6c5.png)
 
-Discussed [here](https://github.com/arendst/Sonoff-Tasmota/issues/6056#issuecomment-510954469)
+Discussed [here](https://github.com/arendst/Tasmota/issues/6056#issuecomment-510954469)
 
 #### Configuration
 

Esptool.md

@@ -1,6 +1,6 @@
 How to setup and configure Esptool for Tasmota upload.
 
-The information below is for the Python version of esptool - If you want to use the Windows/Linux/OSX(MAC) executable version of esptool (as would be included in Arduino ESP8266 cores) then please go to the [esptool executable (non-python)](https://github.com/arendst/Sonoff-Tasmota/wiki/Esptool#esptool-executable-windows--linux) section at the bottom.
+The information below is for the Python version of esptool - If you want to use the Windows/Linux/OSX(MAC) executable version of esptool (as would be included in Arduino ESP8266 cores) then please go to the [esptool executable (non-python)](https://github.com/arendst/Tasmota/wiki/Esptool#esptool-executable-windows--linux) section at the bottom.
 
 ## Download Esptool
 If you do not have an installed copy of Python 2.x or 3.x download and install it from https://www.python.org/.
@@ -13,7 +13,7 @@ Go to the known folder and install Esptool with command ``python setup.py instal
 Packages for Esptool are maintained for [Debian](https://packages.debian.org/stretch/esptool) and [Ubuntu](https://packages.ubuntu.com/cosmic/esptool) and can be installed with `sudo apt install esptool`.
 
 ## Download Tasmota
-Download the latest Tasmota release firmware file [sonoff.bin](https://github.com/arendst/Sonoff-Tasmota/releases) to a known folder. A second source is [thehackbox](http://thehackbox.org/tasmota/release/) This source can be used for OTA too.
+Download the latest Tasmota release firmware file [sonoff.bin](https://github.com/arendst/Tasmota/releases) to a known folder. A second source is [thehackbox](http://thehackbox.org/tasmota/release/) This source can be used for OTA too.
 
 ## Upload Tasmota
 
@@ -74,9 +74,9 @@ For the purpose of simplicity only the Windows version will be explained here, b
 
 Download the latest release from [https://github.com/igrr/esptool-ck/releases](https://github.com/igrr/esptool-ck/releases) and extract the compressed file to a known location.
 
-### Download Sonoff-Tasmota
+### Download Tasmota
 
-Download the latest Tasmota release firmware file [sonoff.bin](https://github.com/arendst/Sonoff-Tasmota/releases) to a known folder (The same folder as where you have the esptool executable will work well for this process to be simpler)
+Download the latest Tasmota release firmware file [sonoff.bin](https://github.com/arendst/Tasmota/releases) to a known folder (The same folder as where you have the esptool executable will work well for this process to be simpler)
 
 If you want features from the current development codebase which has not been included in the last release please download this [sonoff.bin](http://thehackbox.org/tasmota/) to a known folder (The same folder as where you have the esptool executable will work well for this process to be simpler)
 

Expanding-4CH.md

@@ -32,12 +32,12 @@ Final result in these photos:
 |![](https://github.com/arendst/arendst.github.io/blob/master/media/4chjack/final-jack.jpg) |![](https://github.com/arendst/arendst.github.io/blob/master/media/4chjack/final-result.jpg) |
 |---|---|
 
-Sonoff-Tasmota is also configured with DS18x20 on GPIO2 and it works !
+Tasmota is also configured with DS18x20 on GPIO2 and it works !
 
 |![](https://github.com/arendst/arendst.github.io/blob/master/media/4chjack/Sonoff-Configure-Module.png)|![](https://github.com/arendst/arendst.github.io/blob/master/media/4chjack/Sonoff-Main-Menu.png)|
 |---|---|
 
-****Note****: source file [sonoff/sonoff_template.h ](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/sonoff_template.h) provides the configuration on Sonoff 4CH and it is also possible to use GPIO16 (as in the screenshot above) but be aware that no interrupts can be used on GPIO16 and
+****Note****: source file [sonoff/sonoff_template.h ](https://github.com/arendst/Tasmota/blob/development/sonoff/sonoff_template.h) provides the configuration on Sonoff 4CH and it is also possible to use GPIO16 (as in the screenshot above) but be aware that no interrupts can be used on GPIO16 and
 you could have problems with some sensors.
 
 

Expanding-Sonoffs.md

@@ -1,6 +1,6 @@
 One capability of Tasmota is that you can connect additional things to available pins on the [ESP8266](https://en.wikipedia.org/wiki/ESP8266) that controls these devices.
 
-If a pin is defined as GPIO_USER in the module template, you can assign a function to it. (Complete [list](https://github.com/arendst/Sonoff-Tasmota/wiki/Components#components-list)) of functions.
+If a pin is defined as GPIO_USER in the module template, you can assign a function to it. (Complete [list](https://github.com/arendst/Tasmota/wiki/Components#components-list)) of functions.
 
 To make a link between the different naming schemes of pins, connectors and logical functions, the [Pin Definition overview](https://github.com/esp8266/esp8266-wiki/wiki/Pin-definition) in the esp8266 wiki is quite helpful.
 
@@ -49,10 +49,10 @@ Shielding or using twisted pair wiring are other ways to reduce the effect of ra
 Example for 10K Resistor:
 ![](https://user-images.githubusercontent.com/35574450/39960640-8b2735ca-5626-11e8-8128-461b6d9976ad.png)
 Read here:
-[#2708](https://github.com/arendst/Sonoff-Tasmota/issues/2708#issuecomment-388574891)
+[#2708](https://github.com/arendst/Tasmota/issues/2708#issuecomment-388574891)
 
 
-If the Sensor is connected, go on here: [Sensor Configuration](https://github.com/arendst/Sonoff-Tasmota/wiki/Sensor-Configuration)
+If the Sensor is connected, go on here: [Sensor Configuration](https://github.com/arendst/Tasmota/wiki/Sensor-Configuration)
 
 # The ESP8266 - [Hardware](https://tttapa.github.io/ESP8266/Chap04%20-%20Microcontroller.html)
 
@@ -95,7 +95,7 @@ Internal pull-up/-down resistors
 GPIO 0-15 all have a built-in pull-up resistor, just like in an Arduino. GPIO16 has a built-in pull-down resistor.
 
 ### PWM
-Unlike most Atmel chips (Arduino), the ESP8266 doesn’t support hardware PWM, however, software PWM is supported on all digital pins. The default PWM range is 10-bits @ 1kHz, but this can be changed (up to >14-bit@1kHz). Check [Restrictions](https://github.com/arendst/Sonoff-Tasmota/wiki/Expanding-Sonoffs#restrictions).
+Unlike most Atmel chips (Arduino), the ESP8266 doesn’t support hardware PWM, however, software PWM is supported on all digital pins. The default PWM range is 10-bits @ 1kHz, but this can be changed (up to >14-bit@1kHz). Check [Restrictions](https://github.com/arendst/Tasmota/wiki/Expanding-Sonoffs#restrictions).
 
 ### Analog input
 The ESP8266 has a single analog input, with an input range of 0 - 1.0V. If you supply 3.3V, for example, you will damage the chip. Some boards like the NodeMCU have an on-board resistive voltage divider, to get an easier 0 - 3.3V range. You could also just use a trimpot as a voltage divider.

Expanding-Tasmota.md

@@ -1,6 +1,6 @@
 One capability of Tasmota is that you can connect additional things to available pins on the [ESP8266](https://en.wikipedia.org/wiki/ESP8266) that controls these devices.
 
-If a pin is defined as GPIO_USER in the module template, you can assign a function to it. (Complete [list](https://github.com/arendst/Sonoff-Tasmota/wiki/Components#components-list)) of functions.
+If a pin is defined as GPIO_USER in the module template, you can assign a function to it. (Complete [list](https://github.com/arendst/Tasmota/wiki/Components#components-list)) of functions.
 
 To make a link between the different naming schemes of pins, connectors and logical functions, the [Pin Definition overview](https://github.com/esp8266/esp8266-wiki/wiki/Pin-definition) in the esp8266 wiki is quite helpful.
 
@@ -49,10 +49,10 @@ Shielding or using twisted pair wiring are other ways to reduce the effect of ra
 Example for 10K Resistor:
 ![](https://user-images.githubusercontent.com/35574450/39960640-8b2735ca-5626-11e8-8128-461b6d9976ad.png)
 Read here:
-[#2708](https://github.com/arendst/Sonoff-Tasmota/issues/2708#issuecomment-388574891)
+[#2708](https://github.com/arendst/Tasmota/issues/2708#issuecomment-388574891)
 
 
-If the Sensor is connected, go on here: [Sensor Configuration](https://github.com/arendst/Sonoff-Tasmota/wiki/Sensor-Configuration)
+If the Sensor is connected, go on here: [Sensor Configuration](https://github.com/arendst/Tasmota/wiki/Sensor-Configuration)
 
 # The ESP8266 - [Hardware](https://tttapa.github.io/ESP8266/Chap04%20-%20Microcontroller.html)
 
@@ -95,7 +95,7 @@ Internal pull-up/-down resistors
 GPIO 0-15 all have a built-in pull-up resistor, just like in an Arduino. GPIO16 has a built-in pull-down resistor.
 
 ### PWM
-Unlike most Atmel chips (Arduino), the ESP8266 doesn’t support hardware PWM, however, software PWM is supported on all digital pins. The default PWM range is 10-bits @ 1kHz, but this can be changed (up to >14-bit@1kHz). Check [Restrictions](https://github.com/arendst/Sonoff-Tasmota/wiki/Expanding-Tasmota#restrictions).
+Unlike most Atmel chips (Arduino), the ESP8266 doesn’t support hardware PWM, however, software PWM is supported on all digital pins. The default PWM range is 10-bits @ 1kHz, but this can be changed (up to >14-bit@1kHz). Check [Restrictions](https://github.com/arendst/Tasmota/wiki/Expanding-Tasmota#restrictions).
 
 ### Analog input
 The ESP8266 has a single analog input, with an input range of 0 - 1.0V. If you supply 3.3V, for example, you will damage the chip. Some boards like the NodeMCU have an on-board resistive voltage divider, to get an easier 0 - 3.3V range. You could also just use a trimpot as a voltage divider.

FAQ.md

@@ -288,7 +288,7 @@ Your vanilla `sonoff.bin` doesn't have complete sensor support. Make sure you've
 ### Timers trigger at the wrong time
 Check the log in the web UI Console to see if the device's time is set correctly. There are two elements to setting the time: 1. obtaining the UTC time, and, 2. local Daylight Saving Time policies.  
 
-Check the information about your router's features. If the router provides an NTP server, be sure to configure it properly. If the Tasmota device receives its IP address via DHCP from the router, Tasmota will request its time sync from the router's time server. This is managed by the Arduino core, not Tasmota ([\#5283](https://github.com/arendst/Sonoff-Tasmota/issues/5283#issuecomment-466888846)). Therefore, if the NTP server on the router is not configured, or configured improperly, the time on the Tasmota device could be wrong. If the router does not have a time server, this is not the problem.  
+Check the information about your router's features. If the router provides an NTP server, be sure to configure it properly. If the Tasmota device receives its IP address via DHCP from the router, Tasmota will request its time sync from the router's time server. This is managed by the Arduino core, not Tasmota ([\#5283](https://github.com/arendst/Tasmota/issues/5283#issuecomment-466888846)). Therefore, if the NTP server on the router is not configured, or configured improperly, the time on the Tasmota device could be wrong. If the router does not have a time server, this is not the problem.  
 
 If you cannot configure your router's time server to the correct time (e.g., a router provided by your ISP with no access to administration functions), you will need to set a static IP address on the Tasmota device. If the device does not request its address from a DHCP server (i.e., uses a static IP address), the time sync request is forced to `NTPSERVER1`. If can't connect, it tries `NTPSERVER2`. And finally `NTPSERVER3`. Ensure that these parameters are set appropriately and that the device can reach at least one of these time servers. You may want to consider setting up an NTP server locally. As long as the computer is able to set its time at some point from an Internet time server, this computer can serve as an NTP server for your Tasmota device(s). This can be the same computer that hosts your MQTT broker or home automation hub.  
 
@@ -355,7 +355,7 @@ Example: Core-/SDK-Version: **2_3_0**/1.5.3(aec24ac9)
   - Web UI is fast
   - Serial Software exceptions of 2.3.0 are solved
   - Krack Vulnerability is solved
-  - Security fix [Beacon Frame Crash](https://github.com/arendst/Sonoff-Tasmota/issues/6348)
+  - Security fix [Beacon Frame Crash](https://github.com/arendst/Tasmota/issues/6348)
   - More RAM is available
   - Firmware is a little bigger in size compared to 2.4.2
   - Most Wi-Fi Repeaters don't produces conflicts or disconnections

Flash-Sonoff-using-Raspberry-Pi.md

@@ -44,7 +44,7 @@ Summarizing the process and needed connections based on the above blog, please r
 Connect GND, RX->TX and TX->RX as shown below. 
 
 **If you power the device with the 3.3V power from the RPi it will cause it to reboot when connecting.** You can still enter flash mode if you power up the RPi with the 3.3v connected and pressing the connecting GPIO0 to ground (e.g., pressing the button on the Sonoff Basic) simultaneously. It's recommended to use either an external power supply for this or use the 5V GPIO and a 3.3V Voltage Regulator.  
-([issue #4807](https://github.com/arendst/Sonoff-Tasmota/issues/4807))
+([issue #4807](https://github.com/arendst/Tasmota/issues/4807))
 
 **Do not connect 3.3V yet!**
 
@@ -87,7 +87,7 @@ This is how it looks in real-life 😆
    ➜  ~ 
    ```
 
-2. Flash .bin, which you can download from the [release-section](https://github.com/arendst/Sonoff-Tasmota/releases):
+2. Flash .bin, which you can download from the [release-section](https://github.com/arendst/Tasmota/releases):
 
    Again connect 3.3V while pressing button for 10 seconds. Then release and run:
 
@@ -147,5 +147,5 @@ This is how it looks in real-life 😆
 # That’s it :smiley:
 
 Sources:  
-[Flashing commands](https://github.com/arendst/Sonoff-Tasmota/wiki/Esptool)  
+[Flashing commands](https://github.com/arendst/Tasmota/wiki/Esptool)  
 https://spellfoundry.com/2016/05/29/configuring-gpio-serial-port-raspbian-jessie-including-pi-3/

Geekcreit-Sonoff-2-Channel-Relay-(AC-85V-250V).md

@@ -4,10 +4,10 @@
 * Version with enclosure: https://www.banggood.com/Geekcreit-2-Channel-AC-85V-250V-APP-Remote-Control-WIFI-Wireless-Switch-Socket-For-Smart-Home-p-1114958.html?rmmds=search&cur_warehouse=CN
 
 The Geekcreit/"Sonoff" 2CH is based on the ESP8285 via the Itead PSF-B04.
-It is very similar to 4CH DIY, so this wiki page is based on [the page](https://github.com/arendst/Sonoff-Tasmota/wiki/Sonoff-4CH-DIY) for that device.
+It is very similar to 4CH DIY, so this wiki page is based on [the page](https://github.com/arendst/Tasmota/wiki/Sonoff-4CH-DIY) for that device.
 
 More info here:
-https://github.com/arendst/Sonoff-Tasmota/issues/1970
+https://github.com/arendst/Tasmota/issues/1970
 
 ![Geekcreit/"Sonoff" 2CH](https://user-images.githubusercontent.com/5823294/52651590-5b423e80-2ee4-11e9-91d2-9cc4e8535c7d.png)
 
@@ -15,7 +15,7 @@ https://github.com/arendst/Sonoff-Tasmota/issues/1970
 
 ### Geekcreit/"Sonoff" 2CH
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 As always, you need to access the serial interface. The **four serial pins** (3V3, Rx, Tx, GND) can be seen in the picture.
 Unless you have a very steady hand soldering will be required for the TX and RX on the ESP chip.

H801.md

@@ -21,9 +21,9 @@ The chip used on this board is the [ESP8266EX](https://www.espressif.com/sites/d
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
-![H801 board](https://github.com/ascillato/Sonoff-Tasmota_KNX/blob/development/.github/H801.jpg)
+![H801 board](https://github.com/ascillato/Tasmota_KNX/blob/development/.github/H801.jpg)
 
 You need to access the serial interface. The unpopulated serial header (3V3, RX, TX, GND) are available in the middle of the PCB, right next to J3. Note: the RX and TX pins are labelled from the terminal's perspective, not from the perspective of the ESP chip. This means you should connect the RX and TX pins from your computer's UART to the RX and TX pins on the board respectively, not crossing them over!
 
@@ -35,9 +35,9 @@ Most boards supported by the Tasmota firmware use GPIO 1 for serial TX. The H801
 
     module 20
 
-See [#2155](https://github.com/arendst/Sonoff-Tasmota/issues/2155) for more details.
+See [#2155](https://github.com/arendst/Tasmota/issues/2155) for more details.
 
-Please be aware that some of the H801 modules were sold with only 512kB of flash. You can check whether yours is affected by using esptool, with the flash_id command. If you only have 512kB of flash, you can still build your own firmware, but will have to remove components that you do not need, in order to reduce the size of the firmware binary. You will also have to use a linker script for the smaller flash. For an example, see [this issue](https://github.com/arendst/Sonoff-Tasmota/issues/2982)
+Please be aware that some of the H801 modules were sold with only 512kB of flash. You can check whether yours is affected by using esptool, with the flash_id command. If you only have 512kB of flash, you can still build your own firmware, but will have to remove components that you do not need, in order to reduce the size of the firmware binary. You will also have to use a linker script for the smaller flash. For an example, see [this issue](https://github.com/arendst/Tasmota/issues/2982)
 
 ## Known Issue
 While powering up there is a short but bright light flash emitted from the strip. 

Home-Assistant-‐-Manual-Config-(Legacy).md

@@ -1,7 +1,7 @@
 [Home Assistant](https://home-assistant.io/) (Hass) is an open-source home automation platform running on Python 3.
 
 **Important:** The information on this page is related to:
- - Old Sonoff-Tasmota versions: development versions 6.3.0.16 or older (before 2018-12-13)
+ - Old Tasmota versions: development versions 6.3.0.16 or older (before 2018-12-13)
  - Old Home Assistant versions: prior to 0.84.2
 
 ## Hass configuration - General
@@ -16,7 +16,7 @@ This can be done either:
 - Through the UI: Configuration -> General -> Server Management -> Restart
 - From command line: On a Debian Linux based system, use the command `sudo systemctl restart home-assistant`.
 
-In the examples shown the following Sonoff-Tasmota parameters are set:
+In the examples shown the following Tasmota parameters are set:
 - ``MQTT_STATUS_OFF`` in ``user_config.h`` = ``OFF``
 - ``MQTT_STATUS_ON`` in ``user_config.h`` = ``ON``
 - ``SUB_PREFIX`` in ``user_config.h`` = ``cmnd``
@@ -39,7 +39,7 @@ If you are using a localized version (eg. de-DE) be sure to check the correct sp
 
 ## Hass configuration - MQTT broker
 
-As Sonoff-Tasmota is [MQTT](https://www.home-assistant.io/components/mqtt/) based you will need to configure Home Assistant to connect to an MQTT broker. 
+As Tasmota is [MQTT](https://www.home-assistant.io/components/mqtt/) based you will need to configure Home Assistant to connect to an MQTT broker. 
 
 Home Assistant comes with an [embedded MQTT broker](https://www.home-assistant.io/docs/mqtt/broker#embedded-broker) which is easy to set up but you may want to opt for a [separate MQTT broker](https://www.home-assistant.io/docs/mqtt/broker#run-your-own) instead for better stability. A popular choice for this is the open-source [Eclipse Mosquitto](https://mosquitto.org/).
 
@@ -239,7 +239,7 @@ This periodic interval can be changed using the ``TelePeriod`` command (see the
 
 #### Manual updates
 
-Another means of sensor information retrieval from Sonoff-Tasmota is using the status command ``Status 10`` or ``cmnd/sonoff/status 10``. This would result in a message like:
+Another means of sensor information retrieval from Tasmota is using the status command ``Status 10`` or ``cmnd/sonoff/status 10``. This would result in a message like:
 ```
 stat/sonoff/STATUS10 {"StatusSNS":{"Time":"2017-02-11T18:06:05", "DHT22":{"Temperature":"21.8", "Humidity":"48.0"}}}
 ```
@@ -258,7 +258,7 @@ sensor:
     value_template: "{{ value_json.StatusSNS.DHT22.Humidity }}"
     unit_of_measurement: "%"
 ```
-The Sonoff-Tasmota command could be initiated by a mosquitto mqtt pub command on ``mosquitto_pub -h localhost -t 'cmnd/sonoff/status' -m '10'``
+The Tasmota command could be initiated by a mosquitto mqtt pub command on ``mosquitto_pub -h localhost -t 'cmnd/sonoff/status' -m '10'``
 
 ### HTU and BMP I2C sensors
 
@@ -450,7 +450,7 @@ Configure the module as "34 MagicHome", and on the Console run:\
 Configure the module as "18 Generic module", and on the Console run:
 `SetOption17 1` - This enables decimal colors
 
-More info how to configure the GPIO [Arilux LC02](https://github.com/arendst/Sonoff-Tasmota/wiki/Arilux-LC02)
+More info how to configure the GPIO [Arilux LC02](https://github.com/arendst/Tasmota/wiki/Arilux-LC02)
 
 ```yaml
 # Example configuration.yaml entry
@@ -559,9 +559,9 @@ Use the [`fan.mqtt`](https://www.home-assistant.io/components/fan.mqtt/) compone
 
 ### iFan02 - Example 1
 
-From @kbickar in [Support for Ifan02 #2839](https://github.com/arendst/Sonoff-Tasmota/issues/2839)`
+From @kbickar in [Support for Ifan02 #2839](https://github.com/arendst/Tasmota/issues/2839)`
 
-Modified by @finity69x2 in [Support for Ifan02 #2839](https://github.com/arendst/Sonoff-Tasmota/issues/2839)`
+Modified by @finity69x2 in [Support for Ifan02 #2839](https://github.com/arendst/Tasmota/issues/2839)`
 
 ```yaml
 # Example configuration.yaml entry
@@ -597,7 +597,7 @@ fan:
 
 ### iFan02 - Example 2 - Group with Fan + Light
 Combination of configs found in the support thread: 
-[Support for Ifan02 #2839](https://github.com/arendst/Sonoff-Tasmota/issues/2839)
+[Support for Ifan02 #2839](https://github.com/arendst/Tasmota/issues/2839)
 and Home Assistant forum: 
 [Sonoff IFan02 (Tasmota) MQTT Fan](https://community.home-assistant.io/t/sonoff-ifan02-tasmota-mqtt-fan/64083)
 

Home-Assistant-‐-Manual-Config.md

@@ -1,7 +1,7 @@
 [Home Assistant](https://home-assistant.io/) (Hass) is an open-source home automation platform running on Python 3.
 
 **Important:** The information on this page is related to:
- - Sonoff-Tasmota development version 6.3.0.**17** (2018-12-13) or later
+ - Tasmota development version 6.3.0.**17** (2018-12-13) or later
    - **Version 6.3.0 will NOT work**
  - Home Assistant 0.84.2 or later
 
@@ -17,7 +17,7 @@ This can be done either:
 - Through the UI: Configuration -> General -> Server Management -> Restart
 - From command line: On a Debian Linux based system, use the command `sudo systemctl restart home-assistant`.
 
-In the examples shown the following Sonoff-Tasmota parameters are set:
+In the examples shown the following Tasmota parameters are set:
 - ``MQTT_STATUS_OFF`` in ``user_config.h`` = ``OFF``
 - ``MQTT_STATUS_ON`` in ``user_config.h`` = ``ON``
 - ``SUB_PREFIX`` in ``user_config.h`` = ``cmnd``
@@ -40,7 +40,7 @@ If you are using a localized version (eg. de-DE) be sure to check the correct sp
 
 ## Hass configuration - MQTT broker
 
-As Sonoff-Tasmota is [MQTT](https://www.home-assistant.io/components/mqtt/) based you will need to configure Home Assistant to connect to an MQTT broker. 
+As Tasmota is [MQTT](https://www.home-assistant.io/components/mqtt/) based you will need to configure Home Assistant to connect to an MQTT broker. 
 
 Home Assistant comes with an [embedded MQTT broker](https://www.home-assistant.io/docs/mqtt/broker#embedded-broker) which is easy to set up but you may want to opt for a [separate MQTT broker](https://www.home-assistant.io/docs/mqtt/broker#run-your-own) instead for better stability. A popular choice for this is the open-source [Eclipse Mosquitto](https://mosquitto.org/).
 
@@ -241,7 +241,7 @@ sensor:
 
 #### Manual updates
 
-Another means of sensor information retrieval from Sonoff-Tasmota is using the status command ``Status 10`` or ``cmnd/sonoff/status 10``. This would result in a message like:
+Another means of sensor information retrieval from Tasmota is using the status command ``Status 10`` or ``cmnd/sonoff/status 10``. This would result in a message like:
 ```
 stat/sonoff/STATUS10 {"StatusSNS":{"Time":"2017-02-11T18:06:05", "DHT22":{"Temperature":"21.8", "Humidity":"48.0"}}}
 ```
@@ -260,7 +260,7 @@ sensor:
     value_template: "{{ value_json.StatusSNS.DHT22.Humidity }}"
     unit_of_measurement: "%"
 ```
-The Sonoff-Tasmota command could be initiated by a mosquitto mqtt pub command on ``mosquitto_pub -h localhost -t 'cmnd/sonoff/status' -m '10'``
+The Tasmota command could be initiated by a mosquitto mqtt pub command on ``mosquitto_pub -h localhost -t 'cmnd/sonoff/status' -m '10'``
 
 ### HTU and BMP I2C sensors
 
@@ -462,7 +462,7 @@ Configure the module as "18 Generic module", and on the Console run:
 `SetOption17 1` - This enables decimal colors
 `SetOption59 1` - This enables sending of tele/<topic>/STATE on POWER and light related commands
 
-More info how to configure the GPIO [Arilux LC02](https://github.com/arendst/Sonoff-Tasmota/wiki/Arilux-LC02)
+More info how to configure the GPIO [Arilux LC02](https://github.com/arendst/Tasmota/wiki/Arilux-LC02)
 
 ```yaml
 # Example configuration.yaml entry
@@ -571,9 +571,9 @@ Use the [`fan.mqtt`](https://www.home-assistant.io/components/fan.mqtt/) compone
 
 ### iFan02 - Example 1
 
-From @kbickar in [Support for Ifan02 #2839](https://github.com/arendst/Sonoff-Tasmota/issues/2839)`
+From @kbickar in [Support for Ifan02 #2839](https://github.com/arendst/Tasmota/issues/2839)`
 
-Modified by @finity69x2 in [Support for Ifan02 #2839](https://github.com/arendst/Sonoff-Tasmota/issues/2839)`
+Modified by @finity69x2 in [Support for Ifan02 #2839](https://github.com/arendst/Tasmota/issues/2839)`
 
 ```yaml
 # Example configuration.yaml entry
@@ -609,7 +609,7 @@ fan:
 
 ### iFan02 - Example 2 - Group with Fan + Light
 Combination of configs found in the support thread: 
-[Support for Ifan02 #2839](https://github.com/arendst/Sonoff-Tasmota/issues/2839)
+[Support for Ifan02 #2839](https://github.com/arendst/Tasmota/issues/2839)
 and Home Assistant forum: 
 [Sonoff IFan02 (Tasmota) MQTT Fan](https://community.home-assistant.io/t/sonoff-ifan02-tasmota-mqtt-fan/64083)
 

Home-Assistant.md

@@ -1,7 +1,7 @@
 [Home Assistant](https://home-assistant.io/) (Hass) is an open-source home automation platform running on Python 3.
 
 **Important:** The information on this page is related to:
- - Sonoff-Tasmota release 6.4.1
+ - Tasmota release 6.4.1
  - Home Assistant 0.84.2 or later
 
 Binary sonoff-basic.bin (which comes packaged with Tuya Convert) does not support autodiscovery. Please upgrade to sonoff.bin or similar release that supports this feature.
@@ -10,8 +10,8 @@ Binary sonoff-basic.bin (which comes packaged with Tuya Convert) does not suppor
 This page describes configuring Hass and Tasmota for MQTT device discovery.
 
 If you don't want to use this option, please refer to:
- - [[Home Assistant - Manual Config|Home-Assistant-‐-Manual-Config]] - For Home Assistant 0.84.2 or later together with Sonoff-Tasmota developement version built 2018-12-13 or later
+ - [[Home Assistant - Manual Config|Home-Assistant-‐-Manual-Config]] - For Home Assistant 0.84.2 or later together with Tasmota developement version built 2018-12-13 or later
- - [[Home Assistant - Manual Config (Legacy)|Home-Assistant-‐-Manual-Config-(Legacy)]] - For older versions of Home Assistant or Sonoff-Tasmota
+ - [[Home Assistant - Manual Config (Legacy)|Home-Assistant-‐-Manual-Config-(Legacy)]] - For older versions of Home Assistant or Tasmota
 
 Hass configuration is not exposed in the web UI. It is done by editing the `configuration.yaml` file which is found in folder `.homeassistant` after installing and first starting of Hass (or in the `/config` folder, if you’re using Hass.io).
 
@@ -22,7 +22,7 @@ This can be done either:
 
 ## Hass configuration - MQTT broker
 
-As Sonoff-Tasmota is [MQTT](https://www.home-assistant.io/components/mqtt/) based you will need to configure Home Assistant to connect to an MQTT broker. 
+As Tasmota is [MQTT](https://www.home-assistant.io/components/mqtt/) based you will need to configure Home Assistant to connect to an MQTT broker. 
 
 Home Assistant comes with an [embedded MQTT broker](https://www.home-assistant.io/docs/mqtt/broker#embedded-broker) which is easy to set up but you may want to opt for a [separate MQTT broker](https://www.home-assistant.io/docs/mqtt/broker#run-your-own) instead for better stability. A popular choice for this is the open-source [Eclipse Mosquitto](https://mosquitto.org/).
 
@@ -192,7 +192,7 @@ From my configuration.yaml
 # Tasmota Firmware
 # Getting Firmware from JSON for Tasmota
   - platform: rest
-    resource: https://api.github.com/repos/arendst/Sonoff-Tasmota/releases/latest
+    resource: https://api.github.com/repos/arendst/Tasmota/releases/latest
     name: Sonoff Firmware Version Available
     username: !secret githubuser
     password: !secret githubpass

Home-Automation-Integrations.md

@@ -8,7 +8,7 @@
   - [**Manual configuration (Legacy)**](Home-Assistant-‐-Manual-Config-(Legacy))
 - [**HomeBridge**](Homebridge)
 - [**HomeSeer**](HomeSeer)
-- [**IOBroker**](https://github.com/arendst/Sonoff-Tasmota/issues/3769)
+- [**IOBroker**](https://github.com/arendst/Tasmota/issues/3769)
 - [**IP-Symcon**](IP-Symcon)
 - [**NodeRed Examples**](NodeRed)
 - [**nymea**](nymea)

Home.md

@@ -25,14 +25,14 @@ You will need [some tools](Prerequisites) to [prepare](Hardware-preparation) you
 [Tasmota v6.7.1 Allison](../releases/tag/v6.7.1) releases with a fix for the bug causing serious issues in power monitoring devices. 
 
 **2019-10-25**    
-[Tasmota v6.7.0](../releases/tag/v6.7.0) is released bringing support for [blind and shutters](Commands#blinds-shutters-and-roller-shades), [deep sleep and wake up pin](Support-for-Deepsleep-and-Wake-Up-PIN). [Tuya component](tuyamcu) is more customisable supporting a wider range of devices and a plethora of new sensors. Support for [Zigbee](https://github.com/arendst/Sonoff-Tasmota/wiki/Zigbee) devices is in a nascent stage of development.    
+[Tasmota v6.7.0](../releases/tag/v6.7.0) is released bringing support for [blind and shutters](Commands#blinds-shutters-and-roller-shades), [deep sleep and wake up pin](Support-for-Deepsleep-and-Wake-Up-PIN). [Tuya component](tuyamcu) is more customisable supporting a wider range of devices and a plethora of new sensors. Support for [Zigbee](https://github.com/arendst/Tasmota/wiki/Zigbee) devices is in a nascent stage of development.    
 Besides that there are bug fixes and improvements and on top of all that: better support for iFan03, Shelly 2.5, a rewrite of the light driver and the default Arduino core is now pre2.6. Last, but not least, the new sonoff-ir.bin build that has fully featured IR support but at the cost of other features.
 
 _In with the new, out with the old!_    
 Some outdated features have been removed so wave goodbye to: WPS, SmartConfig, sonoff-classic.bin build and Setoptions 2, 34, 41, 44, 45, 46, 65, 66 and 69
 
 **2019-10-10**    
-Tasmota development branch is undergoing a big code rewrite of the light driver. Some things might break in the process, be aware of that if you're installing the daily build on a critical device and make sure to report any [issues](https://github.com/arendst/Sonoff-Tasmota/issues).
+Tasmota development branch is undergoing a big code rewrite of the light driver. Some things might break in the process, be aware of that if you're installing the daily build on a critical device and make sure to report any [issues](https://github.com/arendst/Tasmota/issues).
 
 **2019-07-18**    
 [OTA flash Tasmota on the new Sonoff DIY devices](Sonoff-DIY)

Homebridge.md

@@ -1,6 +1,6 @@
 [Homebridge](https://github.com/nfarina/homebridge) is a NodeJS server which emulates the iOS HomeKit API to enable support for non-native devices (like Sonoff and Magichome devices).
 
-Sonoff-Tasmota compatible plugins have been developed by [macwyznawca](https://www.npmjs.com/~macwyznawca) and [arachnetech](https://www.npmjs.com/~arachnetech) as well as others to add support for these devices in Apple's Home app and through iCloud for automation (iPad, HomePod/Apple TV 4 or newer required).
+Tasmota compatible plugins have been developed by [macwyznawca](https://www.npmjs.com/~macwyznawca) and [arachnetech](https://www.npmjs.com/~arachnetech) as well as others to add support for these devices in Apple's Home app and through iCloud for automation (iPad, HomePod/Apple TV 4 or newer required).
 _Note these plugins are not necessarily specific to Sonoff devices._
 
 The [`homebridge-mqttthing`](https://www.npmjs.com/package/homebridge-mqttthing) package has support for many types of devices and is quite flexible with different options especially for RGB/RGBW LED strips.
@@ -24,7 +24,7 @@ As of 1.0.11 [`homebridge-mqttthing`](https://www.npmjs.com/package/homebridge-m
 
 Check out [macwyznawca's packages](https://www.npmjs.com/~macwyznawca) for supported functions, each in a separate package.
 
-To use Homebridge with Sonoff-Tasmota you need to have an existing MQTT broker set up ([see wiki overview](https://github.com/arendst/Sonoff-Tasmota/wiki/MQTT-Overview)) and each of your Sonoff devices should have a unique topic set.
+To use Homebridge with Tasmota you need to have an existing MQTT broker set up ([see wiki overview](https://github.com/arendst/Tasmota/wiki/MQTT-Overview)) and each of your Sonoff devices should have a unique topic set.
 
 Example screenshot from Apple Home.app
 

HuaFan-Smart-Socket.md

@@ -79,7 +79,7 @@ So if soldering isn't your bag, there are a few connection points that you can g
 
 The process for building the firmware for the HuaFan is basically the same as for the Sonoff but with a few additional steps.
 
-Firstly, make sure that you have installed release 5.5.0 of Sonoff-Tasmota or later and that you have completed all of the standard preparation tasks mentioned in the Wiki.
+Firstly, make sure that you have installed release 5.5.0 of Tasmota or later and that you have completed all of the standard preparation tasks mentioned in the Wiki.
 
 Next, you should ensure that you have installed version 2.4.0-rc1 or later of ESP8266/Arduino core that includes support for the 40MHz crystal used by the HuaFan. Installation instructions can be found [here](https://github.com/esp8266/Arduino/releases) but are essentially as follows:
 - Start Arduino and open Preferences window.

Hyleton-313-Smart-Plug.md

@@ -62,7 +62,7 @@ In this picture Yellow is Tx, Orange is Ground, Grey is Rx and White is Vdd:
 
 Connect the other end of the wires to your USB-to-serial adapter and make sure the supply voltage selected is 3.3V.
 
-Shorting pin *7* (GPIO0) to ground while plugging the serial adapter into the computer's USB port will bring the module into UART firmware upload mode. See https://github.com/arendst/Sonoff-Tasmota/wiki/Esptool for details of how to flash the firmware when in firmware upload mode.
+Shorting pin *7* (GPIO0) to ground while plugging the serial adapter into the computer's USB port will bring the module into UART firmware upload mode. See https://github.com/arendst/Tasmota/wiki/Esptool for details of how to flash the firmware when in firmware upload mode.
 
 Once you have flashed the firmware, leave the jumpers soldered to the pins and unplug & reinsert your USB-to-serial adapter - this will reset the unit and provide voltage to the ESP8266 which will then boot the new Tasmota firmware - you'll see a Wifi network called "sonof-xxxx" if it has flashed successfully worked (if you do not see the wifi, the flashing process might not have worked correctly and you'll need to try again).
 
@@ -89,7 +89,7 @@ If you've done everything right you should have a fairly clean looking plug stil
 
 Enroll your plug back onto your wifi as usual for Tasmota (i.e. join the wifi network started by the plug, give it your wifi details, then restart it).
 
-Once *Sonoff-Tasmota*'s WebUI configuration interface is loaded in the browser, you need to configure the template type:
+Once *Tasmota*'s WebUI configuration interface is loaded in the browser, you need to configure the template type:
 
 1. Go to "Configuration"
 1. Go to "Configure template"
@@ -105,7 +105,7 @@ Once you have saved the template:
 1. Select the new template you just created and save.
 
 ### Note on LEDs
-*Sonoff* devices usually have a bi-colour LED, but just one of the colours can be controlled directly. The other colour is usually tied together with the relay, so it cannot be controlled independently. I think that is the reason why the *Sonoff-Tasmota* firmware by default controls just *Led1* when a single relay is configured. In the configuration above, only the blue LED will be used (tied to *GPIO2*). But if you prefer the red LED, just change the values for *Led1i* and *Led2i* (select *Led1i* for *GPIO0* and *Led2i* for *GPIO2*).
+*Sonoff* devices usually have a bi-colour LED, but just one of the colours can be controlled directly. The other colour is usually tied together with the relay, so it cannot be controlled independently. I think that is the reason why the *Tasmota* firmware by default controls just *Led1* when a single relay is configured. In the configuration above, only the blue LED will be used (tied to *GPIO2*). But if you prefer the red LED, just change the values for *Led1i* and *Led2i* (select *Led1i* for *GPIO0* and *Led2i* for *GPIO2*).
 
 ## Additional Details
 If you want to read a detailed project log that uses this plug, you can do so at [GitHub Blog page](https://znanev.github.io/Hyleton-313-Smart-Plug/), although some of the information is now out of date.

KNX-Features.md

@@ -45,7 +45,7 @@ For using rules:
 
 There are multiple possible configurations. Here are explained just a few as example. The options for selecting relays, buttons, sensors, etc. are only available if were configured on _Configure Module Menu_.
 
-To configure KNX, enter on the Configuration Menu of Sonoff-Tasmota and select Configure KNX.
+To configure KNX, enter on the Configuration Menu of Tasmota and select Configure KNX.
 
 <img src="https://github.com/ascillato/Sonoff-Tasmota_KNX/blob/development/.github/Config_Menu.jpg" />
 <img src="https://github.com/ascillato/Sonoff-Tasmota_KNX/blob/development/.github/KNX_menu.jpg" />
@@ -92,7 +92,7 @@ DEVICE 2
 
 ### 4) Setting a Temperature sensor: ###
 
-We can configure to send the value of temperature or humidity every teleperiod. This teleperiod can be configured. See Sonoff Tasmota [wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Commands). It is recommended also to set the reply temperature address.
+We can configure to send the value of temperature or humidity every teleperiod. This teleperiod can be configured. See Sonoff Tasmota [wiki](https://github.com/arendst/Tasmota/wiki/Commands). It is recommended also to set the reply temperature address.
 
 <img src="https://github.com/ascillato/Sonoff-Tasmota_KNX/blob/development/.github/7.jpg" />
 

KingArts-touch-Dimmer-(1-gang).md

@@ -40,7 +40,7 @@ RX    to   RX  (due to the fact the silkscreen is wrong, otherwise, RX connects
 TX    to   TX  
 SW    to   GND  -- only durning power up, to put the ESP in programming mode.
 
-From here the upload is the same as for all other Tasmota devices. See the [Tasmota page](https://github.com/arendst/Sonoff-Tasmota/wiki/Upload) for detailed info.
+From here the upload is the same as for all other Tasmota devices. See the [Tasmota page](https://github.com/arendst/Tasmota/wiki/Upload) for detailed info.
 
 After the upload was successful, unplug the device from the serial adapter. You can now desolder all the connections you have made earlier. Also remove the wire between RES1 and GND.
 Then plug the board back in its housing. Be careful with the connector on the underside of the board.
@@ -57,7 +57,7 @@ Keep in mind, the dimmer itself needs a Neutral wire as well. If you replace an
 ## First connection
 
 When you first power up the dimmer switch, it comes up in AccesPoint mode.
-Follow the instructions [here](https://github.com/arendst/Sonoff-Tasmota/wiki/Initial-Configuration) 
+Follow the instructions [here](https://github.com/arendst/Tasmota/wiki/Initial-Configuration) 
 
 ## Set correct module type
 

Luminea-ZX-2844-675-(RGBW-LED-Controller).md

@@ -44,7 +44,7 @@ There is an second version with a green PCB and different pinout:
 
 ## Serial Connection
 
-See the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+See the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 ![](https://i.ibb.co/NtDnSQ4/JCDXSRGBW.jpg)
 

MCP23008-MCP23017.md

@@ -153,7 +153,7 @@ rule on event#MCPINT_D0=1 do power on endon on event#MCPINT_D0=0 do power off en
 
 In the example above the rule would respond to an interrupt of HIGH on pin 0 of the MCP by executing command "power on" and respond to an interrupt of LOW on pin 0 with the command "power off"
 
-See the Wiki on [Using Rules](https://github.com/arendst/Sonoff-Tasmota/wiki/Rules) for more information on how this can be helpful to your requirements.
+See the Wiki on [Using Rules](https://github.com/arendst/Tasmota/wiki/Rules) for more information on how this can be helpful to your requirements.
 
 If you require only one of the two reporting methods you may use the sensor29 command to configure the interrupt behavior according to your requirements using command:
 

MCU-Based-Tuya-Dimmers-and-Switches.md

@@ -4,7 +4,7 @@ There are several Tuya dimmer and switch variants made by various manufacturers.
 
 The basic identification of a Tuya device is when the device information references the "Tuya Smart", "SmartLife", or "Smart Living" app. These switches and dimmers are based on a [Tuya TYWE3S Wi-Fi PCB](https://docs.tuya.com/en/hardware/WiFi-module/wifi-e3s-module.html) module along with an MCU. TYWE3S is based on the ESP8266 which is supported by Tasmota.
 
-[Wiki page for TYWE3S](https://github.com/arendst/Sonoff-Tasmota/wiki/TYWE3S)
+[Wiki page for TYWE3S](https://github.com/arendst/Tasmota/wiki/TYWE3S)
 
 The TYWE3S module mostly takes care of Wi-Fi and software features while the MCU controls the actual hardware (buttons, relays, dimmer, power measurement, etc). The MCU is interfaced to TYWE3S using the serial interface which connects to the Rx and Tx pins.
 
@@ -43,7 +43,7 @@ If an MCU is present, bridge RST to GND on the MCU
 
 Use a 6.6.0.10 Tasmota version or higher. There are lots of Tuya Serial fixes / features added in there and the tutorial below expects them.
 
-Now you need to follow the commands explained in the [flashing tutorial](https://github.com/arendst/Sonoff-Tasmota/wiki/Flashing).
+Now you need to follow the commands explained in the [flashing tutorial](https://github.com/arendst/Tasmota/wiki/Flashing).
 
 TIP: If you are using jumper headers use `sleep 15 &&` before your commands, this would free your hand and give you some time to set the jumper pins and connect the USB to PC.
 
@@ -65,7 +65,7 @@ TIP: If you are using jumper headers use `sleep 15 &&` before your commands, thi
 
 6. If the device is connecting fine to your network, now is the time to power it down and re-assemble it. Connect a test bulb (or to the final place if you don't mind testing there)
 7. Once this is saved and device is rebooted. Open the Tasmota configuration page and you should be able to use the Toggle button to toggle the dimmer or at least one of the gangs in a multi gang switch.
-8. Follow the process [here](https://github.com/arendst/Sonoff-Tasmota/wiki/TuyaMCU) depending on switch or dimmer.
+8. Follow the process [here](https://github.com/arendst/Tasmota/wiki/TuyaMCU) depending on switch or dimmer.
 
 ## Product Specific guides
 ### [Otim Dimmer](Otim-Dimmer)

MQTT-Features.md

@@ -4,7 +4,7 @@ Sonoff responds to the following MQTT commands using MQTT Topic for ```cmnd/sono
 
 - The power state message can be sent with the retain flag set. Enable this with ```cmnd/sonoff/PowerRetain on```.
 
-- The telemetry messages can also be sent with the retain flag, but this is a compile time option. See [#1071](https://github.com/arendst/Sonoff-Tasmota/issues/1071).
+- The telemetry messages can also be sent with the retain flag, but this is a compile time option. See [#1071](https://github.com/arendst/Tasmota/issues/1071).
 
 - For Sonoff Dual or 4CH the relays need to be addressed with `cmnd/sonoff/power<x>`, where `<x>` is the relay number from 1 to 2 (Dual) or from 1 to 4 (4CH).
 
@@ -47,7 +47,7 @@ Recommendation: **Use both tokens at all time within your FullTopic string**
 
 ## Send multiple MQTT commands at once
 
-To change connectivity configuration over MQTT you can (should) use the [Backlog command](https://github.com/arendst/Sonoff-Tasmota/wiki/Commands#using-backlog) to send multiple commands to your Sonoff(s) at once and prevent reboot between the commands. For example you can change the wifi SSID and Password in one step by sending the following MQTT message to your sonoff's `Backlog` topic:
+To change connectivity configuration over MQTT you can (should) use the [Backlog command](https://github.com/arendst/Tasmota/wiki/Commands#using-backlog) to send multiple commands to your Sonoff(s) at once and prevent reboot between the commands. For example you can change the wifi SSID and Password in one step by sending the following MQTT message to your sonoff's `Backlog` topic:
 
 ```mosquitto_pub -t 'cmnd/yoursonoff/Backlog' -m 'ssid1 yournewssid; password1 yournewpassword'```
 

MQTT-Overview.asciidoc

@@ -60,7 +60,7 @@ Note: By default firmware will search for an MQTT broker using mDNS by searching
 
 ### General
 
-See the wiki's https://github.com/arendst/Sonoff-Tasmota/wiki/Commands[command list] for the definitive list of operations that you can perform. The first word in the column marked `Command` is the text that you need to put at the end of a `cmnd` string when you issue a publication message. The second word is the contents of the payload. If there is no second word, you can simply send an empty payload. For example:
+See the wiki's https://github.com/arendst/Tasmota/wiki/Commands[command list] for the definitive list of operations that you can perform. The first word in the column marked `Command` is the text that you need to put at the end of a `cmnd` string when you issue a publication message. The second word is the contents of the payload. If there is no second word, you can simply send an empty payload. For example:
 
 [options="header"]
 |===

MQTT.md

@@ -72,7 +72,7 @@ In the following examples `%topic%` is `sonoff` for demonstration purposes:
 
 - The power state message can be sent with the retain flag set. Enable this with ```cmnd/sonoff/PowerRetain on```.
 
-- The telemetry messages can also be sent with the retain flag, but this is a compile time option. See [#1071](https://github.com/arendst/Sonoff-Tasmota/issues/1071).
+- The telemetry messages can also be sent with the retain flag, but this is a compile time option. See [#1071](https://github.com/arendst/Tasmota/issues/1071).
 
 - For sonoff dual or 4CH the relays need to be addressed with ```cmnd/sonoff/power{n}```, where {n} is the relay number from 1 to 2 (Sonoff Dual) or from 1 to 4 (Sonoff 4CH). `cmnd/sonoff/power4 off` turns off the 4th relay on a Sonoff 4CH.
 

MagicHome-LED-strip-controller.md

@@ -38,11 +38,11 @@ Steps used:
 1. Connect RX from the MagicHome to TX on the programmer. TX from the board goes to RX on the programmer.
 1. Connect GPIO00 to GND (best to use same column on the breadboard)
 1. Connect the 12V power supply to MagicHome. As GPIO00 is connected to GND, board will go into flash mode. Disconnect GPIO00 after few seconds.
-1. Upload Sonoff-Tasmota like it would be any other board.
+1. Upload Tasmota like it would be any other board.
 1. Once upload is complete, disconnect power from the MagicHome controller
 1. Disconnect RX and TX and then only then GND. GND gets disconnected **LAST.**
 
-You can then connect the power back to the board and Sonoff-Tasmota should be running on it. Once you verify that board is up and you can access it over the Web, you can unsolder temporary wires and update subsequent firmware versions using OTA.
+You can then connect the power back to the board and Tasmota should be running on it. Once you verify that board is up and you can access it over the Web, you can unsolder temporary wires and update subsequent firmware versions using OTA.
 
 ## Configuration 
 
@@ -51,9 +51,9 @@ Some GPIO are preconfigured with the board:
 - GPIO14 - (PWM1) Red color on the LED strip, second pin from the GND
 - GPIO12 - (PWM3) Blue color on the LED strip, third pin from the GND
 
-For instructions to setup the 24 Button Remote visit the [AL-LC04 device page](https://github.com/arendst/Sonoff-Tasmota/wiki/Arilux-LC04)
+For instructions to setup the 24 Button Remote visit the [AL-LC04 device page](https://github.com/arendst/Tasmota/wiki/Arilux-LC04)
 
-Check this for Board Version 2.3 : [#1867](https://github.com/arendst/Sonoff-Tasmota/issues/1867#issuecomment-364811579)
+Check this for Board Version 2.3 : [#1867](https://github.com/arendst/Tasmota/issues/1867#issuecomment-364811579)
 
 Due to variants, you can configure:
 - GPIO04 - on non-IR boards, it's an open pin you can use for Onewire, button or something else. It might have pull-down resistor and/or bypass capacitor, so please take that into consideration. On IR-enabled boards, IR receiver is connected to this pin, so you can use IRRecv as functionality.
@@ -88,6 +88,6 @@ mosquitto_pub -t 'cmnd/light/rule2' -m '1'
 mosquitto_pub -t 'cmnd/light/rule3' -m '1'
 ```
 
-The hex codes for the "Data" value come from the data tag when looking at the JSON sent via MQTT. You can also view this data on the Tasmota console screen. From here you can program it to do what ever you want. See here for more details: https://github.com/arendst/Sonoff-Tasmota/wiki/Rules
+The hex codes for the "Data" value come from the data tag when looking at the JSON sent via MQTT. You can also view this data on the Tasmota console screen. From here you can program it to do what ever you want. See here for more details: https://github.com/arendst/Tasmota/wiki/Rules
 
 ![](https://i.imgur.com/AWXrYTp.jpg)

MagicHome-with-ESP8285.md

@@ -144,4 +144,4 @@ mosquitto_pub -t 'cmnd/RGBled/rule2' -m 'ON'
 mosquitto_pub -t 'cmnd/RGBled/rule3' -m 'ON'
 ```
 
-The hex codes for the "Data" value come from the data tag when looking at the JSON sent via MQTT. You can also view this data on the Tasmota console screen. From here you can program it to do whatever you want using [Rules](https://github.com/arendst/Sonoff-Tasmota/wiki/Rules).
+The hex codes for the "Data" value come from the data tag when looking at the JSON sent via MQTT. You can also view this data on the Tasmota console screen. From here you can program it to do whatever you want using [Rules](https://github.com/arendst/Tasmota/wiki/Rules).

Martin-Jerry-MJ-SD01.md

@@ -30,7 +30,7 @@ From top to bottom on CN1 above, they are:
 | CN1-5 | GROUND | 
 | CN1-6 | VCC |
 
-[See Tasmota Hardware Prep for more details](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation)
+[See Tasmota Hardware Prep for more details](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation)
 
 I removed all the crappy lead-free solder and put on a little strip of female pin header:
 
@@ -38,7 +38,7 @@ I removed all the crappy lead-free solder and put on a little strip of female pi
 
 Now I can easily hook it all up to the breadboard!
 
-I erased the firmware using the [instructions](https://github.com/arendst/Sonoff-Tasmota/wiki/Flash-Sonoff-using-Raspberry-Pi) using a Raspberry Pi 3 Model B. I couldn’t get the board into programming mode by grounding the reset pin through the breadboard, so I just held the UP1 button while connecting 3V3 and it worked fine.
+I erased the firmware using the [instructions](https://github.com/arendst/Tasmota/wiki/Flash-Sonoff-using-Raspberry-Pi) using a Raspberry Pi 3 Model B. I couldn’t get the board into programming mode by grounding the reset pin through the breadboard, so I just held the UP1 button while connecting 3V3 and it worked fine.
 
 There’s another 4-wire connector that goes to the AC board. The wires are as follows:
 

Mirabella-Genio-Bulb.md

@@ -11,7 +11,7 @@ Follow this [procedure](https://github.com/ct-Open-Source/tuya-convert#procedure
 
 To get the bulb into config mode, have the bulb on for at least 10 seconds, then cycle it off and on 3 times via a physical light switch. The bulb should flash rapidly when its in config mode.
 
-Sonoff-Tasmota v6.4.1 basic build is included as part of the tuya-convert script. It will open an WiFi access point named sonoff-XXX on the bulb once flashed correctly.
+Tasmota v6.4.1 basic build is included as part of the tuya-convert script. It will open an WiFi access point named sonoff-XXX on the bulb once flashed correctly.
 
  
 ## Flashing via Serial

NodeRed.md

@@ -4,9 +4,9 @@
 
 https://www.instructables.com/id/Powerful-Standalone-Home-Automation-System-Pi-Sono/
 
-* Detailed setting up of sensors and LEDs using Sonoff-Tasmota:
+* Detailed setting up of sensors and LEDs using Tasmota:
 
-https://www.instructables.com/id/Home-Automation-Sonoff-Tasmota-Sensors-LEDs-Develo/
+https://www.instructables.com/id/Home-Automation-Tasmota-Sensors-LEDs-Develo/
 
 Credits: @MikePRoberts
 

OBI-Socket-2.md

@@ -1,6 +1,6 @@
 # OBI Socket 2
 
-***Supported since version [6.4.1.8](https://github.com/arendst/Sonoff-Tasmota/issues/4829) as OBI Socket 2 (61)***
+***Supported since version [6.4.1.8](https://github.com/arendst/Tasmota/issues/4829) as OBI Socket 2 (61)***
 
 Another cheap socket from the German Hardware Store, based on ESP-WROOM-02 with 2MB Flash. Smaller form factor as the first OBI Socket. 
 
@@ -18,7 +18,7 @@ One way to flash the module is soldering 4 wires to the RX/TX/3V3/GND pins from
 
 Another way to flash is soldering 4 wires to the bottom side of the PCB as described on https://github.com/mattzzw/obi_socket/wiki/OBI-socket. If you follow that approach of powering the socket with 5V (which enables the relay coil allowing for acoustic feedback) you need to make sure to nevertheless use 3V3 for the actual serial interface to the module!!! This happens to work out very nicely with the popular cheap CH340 USB to Serial TTL adapters which come with a jumper to select between 5V and 3.3V. Setting the adapter to 3.3V by putting the jumper on the 3V3 and VCC pins leaves the 5V pin free. That pin is directly connected to the USB port. So you can just connect the four wires from the socket to the four free pins of the CH340 adapter :-)
 
-If you want the green Wi-Fi LED to work, please use version 6.4.1.8+. You can either use "Obi Socket 2 Type (61)" (with default behaviour "Wi-Fi LED = off" when connected) or use "Generic (18)" for manually override. See issue [4567](https://github.com/arendst/Sonoff-Tasmota/issues/4567) for details.
+If you want the green Wi-Fi LED to work, please use version 6.4.1.8+. You can either use "Obi Socket 2 Type (61)" (with default behaviour "Wi-Fi LED = off" when connected) or use "Generic (18)" for manually override. See issue [4567](https://github.com/arendst/Tasmota/issues/4567) for details.
 
 ## PCB serial pinouts
 ![PCB](https://user-images.githubusercontent.com/43306023/49151886-7e137c80-f311-11e8-99d6-c51c55699d9d.JPG)

OBI-Wifi-Socket.md

@@ -19,7 +19,7 @@ Connect GPIO0 to GND before connecting power to enable flash mode!
 ### Additional Information
 A low pulse on GPIO12 switches the relay on, a low pulse on GPIO5 switches it off.  
 I have solved the 'pulse issue' by setting GPIO12 to always 0 (as LED) and works fine.   
-More Infos can be found here: [#1988](https://github.com/arendst/Sonoff-Tasmota/issues/1988).
+More Infos can be found here: [#1988](https://github.com/arendst/Tasmota/issues/1988).
 
 ### Initial Configuration
 In the default configuration GPIO0 (which is also used to enable flash-mode) is setup as a Button.  

OTA-over-SCP.md

@@ -1,4 +1,4 @@
-How to setup and configure "OTA over SCP" upload for PlatformIO. The uploader pushes .bin files to remote OTA server using SCP (SSH connection). Images can be served to Sonoff-Tasmotas from there.
+How to setup and configure "OTA over SCP" upload for PlatformIO. The uploader pushes .bin files to remote OTA server using SCP (SSH connection). Images can be served to Tasmotas from there.
 
 # Configuration
 To upload .bin images to OTA server using SCP, edit the following lines under target environment:

Other-Devices.md

@@ -14,7 +14,7 @@
 - [Teckin SP23](Teckin-SP23)
 - [LA-WF3 Wifi Plug (Tuya TYWE2S) - Costco ](CE-Smart-Home---LA-WF3-Wifi-Plug-(TYWE2S))
 - [No-Brand Smart Plug with Tuya-based ESP8266MOD and ESP-12F modules](Tuya-Smart-Plug-Models-ESP8266MOD-by-AI-THINKER-and-ESP-12F-by-TUYA-LN-0026)
-- [WiOn 50055 Indoor Wi-Fi Switch With USB](https://wionproducts.com/product/wion-indoor-wi-fi-switch-usb/) (support for relay and switch only - no power monitoring yet. See status [here #82](https://github.com/arendst/Sonoff-Tasmota/issues/82).)
+- [WiOn 50055 Indoor Wi-Fi Switch With USB](https://wionproducts.com/product/wion-indoor-wi-fi-switch-usb/) (support for relay and switch only - no power monitoring yet. See status [here #82](https://github.com/arendst/Tasmota/issues/82).)
 - [SM-SO301 4 mains Power Strip with 4 USB ports](SM-SO301)
 - [LeFun SK2 Smart Power Strip with 4 Mains + 4 USB](LeFun-SK2-Smart-Power-Strip-(Model-ZLD-44USA-W))
 - [meross MSS425 Smart Power Strip](meross-MSS425)
@@ -25,7 +25,7 @@
 - [Mirabella Genio Smart Plug](Mirabella-Genio-Smart-Plug)
 - [CE Smart Home™ Garden Power Stake](CE-Smart-Home™-Garden-Power-Stake)
 - [4CH-Wifi-Socket-with-USB-Charger (Tuya TYWE2S)](4CH-Wifi-Socket-with-USB-Charger-(TYWE2S))
-- [Anoopsyche JH-G01B1](https://github.com/arendst/Sonoff-Tasmota/issues/5066#issuecomment-458741056)
+- [Anoopsyche JH-G01B1](https://github.com/arendst/Tasmota/issues/5066#issuecomment-458741056)
 - [RGB Smart Socket with Power Monitor 16A EU](RGB-Smart-Plug-16A)
 - [Supernight Dual Wifi Plug](Supernight-dual-wifi-plug)
 - [TMRLife Plug or Home Awesome Plug](Home-Awesome-Breathing-Light-Smart-Plug-Mini-TMRLIFE-%5B2-PACK%5D-WiFi-Smart-Plug)

PCA9685.md

@@ -26,7 +26,7 @@ The driver is not included during the compilation of the standard released binar
 #define USE_PCA9685_FREQ 50    // Support is for 24 to 1526 Hz
 ```
 
-For information on how to set up a development environment please check the wiki on [Arduino IDE (the easiest, probably)](https://github.com/arendst/Sonoff-Tasmota/wiki/Arduino-IDE) or [PlatformIO](https://github.com/arendst/Sonoff-Tasmota/wiki/PlatformIO)
+For information on how to set up a development environment please check the wiki on [Arduino IDE (the easiest, probably)](https://github.com/arendst/Tasmota/wiki/Arduino-IDE) or [PlatformIO](https://github.com/arendst/Tasmota/wiki/PlatformIO)
 
 Note that the I<sup>2</sup>C selection must correspond with how you have wired the module or chip as incorrect addressing will result in the PCA9685 not being detected. The valid I<sup>2</sup>C address range is 0x40 through 0x47 for the PCA9685 and most off-the-shelf modules would likely default to 0x40.
 

PID-Control-with-Sonoff-Devices.md

@@ -1,20 +1,20 @@
-This extension adds a PID (Proportional Integral Derivative) feature into the Sonoff-Tasmota software.  
+This extension adds a PID (Proportional Integral Derivative) feature into the Tasmota software.  
 
 The PID algorithm is one designed to be used to control real-world processes that the users of Sonoff devices are likely to encounter.  This includes room heating/cooling, temperature control when brewing, and a multitude of other processes.  The PID tuning parameters are designed to be meaningful in the real world (rather than the abstract Ki Kd Kp that are often used which are completely meaningless to most). The algorithm is based on that in the node-red node [node-red-contrib-pid](https://www.npmjs.com/package/node-red-contrib-pid) which has been well received.
 
 In use it can either regularly be given the current process value via MQTT or if the device has a sensor attached then that sensor can be used to read the process value.  So using a TH10 with a DS18B20 the complete PID loop control can be build into the device so that the process will continue to be controlled even if the wifi is down.  This is a very cost effective way of achieving PID control.
 
-The algorithm allows the relay to be used in a time proportioned way using the [Time Proportioned output](https://github.com/arendst/Sonoff-Tasmota/wiki/Time-Proportioned-Output-support) extension.
+The algorithm allows the relay to be used in a time proportioned way using the [Time Proportioned output](https://github.com/arendst/Tasmota/wiki/Time-Proportioned-Output-support) extension.
 
 The loop tuning parameters can be set at build time and can be adjusted at run time via MQTT.
 
-To add the feature into the standard Tasmotta s/w (at least version 5.12.0 is required) then have a look at the pid_branch of the tasmota fork at https://github.com/colinl/Sonoff-Tasmota/tree/pid_branch. Pick up from there the files in the folder `lib/ProcessControl` (which are from this [process-control repository](https://github.com/colinl/process-control)) and `sonoff/xdrv_91_timeprop.ino` and `sonoff/xdrv_92_pid.ino` and add them into your Sonoff-Tasmota sources.
+To add the feature into the standard Tasmotta s/w (at least version 5.12.0 is required) then have a look at the pid_branch of the tasmota fork at https://github.com/colinl/Sonoff-Tasmota/tree/pid_branch. Pick up from there the files in the folder `lib/ProcessControl` (which are from this [process-control repository](https://github.com/colinl/process-control)) and `sonoff/xdrv_91_timeprop.ino` and `sonoff/xdrv_92_pid.ino` and add them into your Tasmota sources.
 
 The PID code adds about 4.3k and the Timeprop code another 1.2k
 
 Instructions for setup are in the two xdrv files.
 
-The ESP8266 will run the PID algorithm at 1 cycle per second, which is much faster than is needed for the sort of processes Sonoff devices are usually associated with.  It rather clobbers the Sonoff-Tasmota terminal output in the web browser at that rate so it is getting near to the limit.  The maximum anyone is likely to need it running at is maybe once every 5 seconds, and the majority of home IoT applications probably nearer once per minute would be sufficient, so the device is well up to the task.
+The ESP8266 will run the PID algorithm at 1 cycle per second, which is much faster than is needed for the sort of processes Sonoff devices are usually associated with.  It rather clobbers the Tasmota terminal output in the web browser at that rate so it is getting near to the limit.  The maximum anyone is likely to need it running at is maybe once every 5 seconds, and the majority of home IoT applications probably nearer once per minute would be sufficient, so the device is well up to the task.
 
 Help with using the PID algorithm and with loop tuning can be found at  http://blog.clanlaw.org.uk/2018/01/09/PID-tuning-with-node-red-contrib-pid.html  This is directed towards using the algorithm in the node-red node node-red-contrib-pid but the algorithm here is based on the same code so the tuning technique described there should work just the same.
 

PN532.md

@@ -1,10 +1,10 @@
-### PN532 HSU Driver for Sonoff-Tasmota
+### PN532 HSU Driver for Tasmota
 
 The PN532 is a highly integrated transceiver module for contactless communication at 13.56 MHz based on the 80C51 microcontroller core.
 
 The datasheet for the PN532 chip is available here: [https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf](https://www.nxp.com/docs/en/nxp/data-sheets/PN532_C1.pdf)
 
-Please note that although the datasheet mentions that the PN532 can be used on SPI, I<sup>2</sup>C and HSUART that only the HSU interface is implemented in the Sonoff-Tasmota driver.
+Please note that although the datasheet mentions that the PN532 can be used on SPI, I<sup>2</sup>C and HSUART that only the HSU interface is implemented in the Tasmota driver.
 
 ### PN532 Breakout boards
 
@@ -14,13 +14,13 @@ Since the PN532 chip itself is surface mount and requires some external componen
 
 Please make sure the breakout board you order has the HSU pins (SCL=TX and SDA=RX) broken out as it will be very difficult to add them manually - Usually they have them but for good measure just make sure.
 
-### PN532 Configuration in Sonoff-Tasmota
+### PN532 Configuration in Tasmota
 
 The driver for the PN532 is not included in any of the default release binaries so you will need to compile your own binary for the purpose of using the PN532.
 
-To enable it prior to compilation you need to add the following one or more lines in your `user_config_override.h` file, depending on your use-case (don't use Core 2.3.0, the core has [issues with software serial](https://github.com/arendst/Sonoff-Tasmota/wiki/Troubleshooting#arduino-core-differences)).
+To enable it prior to compilation you need to add the following one or more lines in your `user_config_override.h` file, depending on your use-case (don't use Core 2.3.0, the core has [issues with software serial](https://github.com/arendst/Tasmota/wiki/Troubleshooting#arduino-core-differences)).
 
-Please note that the DATA field functionality has proven to work on some cards/tags but not all cards/tags - Please see Issue https://github.com/arendst/Sonoff-Tasmota/issues/4941 for more information about this.
+Please note that the DATA field functionality has proven to work on some cards/tags but not all cards/tags - Please see Issue https://github.com/arendst/Tasmota/issues/4941 for more information about this.
 
 `#define USE_PN532_HSU`
 
@@ -30,7 +30,7 @@ Please note that the DATA field functionality has proven to work on some cards/t
 
 The latter is only necessary if you need to perform actions on the local device using rules. If you only plan to handle the resulting scanned information on your home automation software then you do not need to uncomment `#define USE_PN532_CAUSE_EVENTS` as it has no use if you are not going to take an action on the device itself.
 
-Please note that `USE_PN532_DATA_FUNCTIONS` are experimental - See Issue https://github.com/arendst/Sonoff-Tasmota/issues/4941 for more information as we are still researching the limitations of this usage because it seems not all cards are supported by this driver and/or the PN532 module.
+Please note that `USE_PN532_DATA_FUNCTIONS` are experimental - See Issue https://github.com/arendst/Tasmota/issues/4941 for more information as we are still researching the limitations of this usage because it seems not all cards are supported by this driver and/or the PN532 module.
 
 Once you have compiled and uploaded your new firmware you will need to configure the usual (such as your wifi configuration and MQTT server configuration etc) and when complete proceed to enable GPIO pins for PN532 Tx and PN532 Rx on your ESP8266 device.
 
@@ -60,9 +60,9 @@ During start-up the following information should be visible in your console outp
 
 If the device was not found please check your wiring and configuration and confirm that everything is as it should be.
 
-### Using the PN532 on Sonoff-Tasmota
+### Using the PN532 on Tasmota
 
-Sonoff-Tasmota will scan for a new card detect 4 times per second and if found will report it via immediate telemetry and in addition cause an event if you chose to uncomment `#define USE_PN532_CAUSE_EVENTS` prior to compiling your firmware.
+Tasmota will scan for a new card detect 4 times per second and if found will report it via immediate telemetry and in addition cause an event if you chose to uncomment `#define USE_PN532_CAUSE_EVENTS` prior to compiling your firmware.
 
 The output on the console will look similar to the below when a new card is detected
 
@@ -88,7 +88,7 @@ Once executed the very next card/tag that is presented to the reader will have i
 
 Text logging of the above two actions are also presented during the process for information purposes.
 
-### Using the UID and DATA of a presented card in Sonoff-Tasmota
+### Using the UID and DATA of a presented card in Tasmota
 
 When a card is presented to the PN532 under normal operating conditions up to 3 ways of using the data is possible.
 

PZEM-0XX.md

@@ -13,4 +13,4 @@
 ![](https://user-images.githubusercontent.com/5904370/67893552-0cfacb80-fb57-11e9-9a9b-67482ca905d1.png)
 
 ## Note on Calibration
-[Per Theo](https://github.com/arendst/Sonoff-Tasmota/issues/3208#issuecomment-405048466) - As the PZEM is a dedicated energy monitor, device calibration in TASMOTA is currently not supported.
+[Per Theo](https://github.com/arendst/Tasmota/issues/3208#issuecomment-405048466) - As the PZEM is a dedicated energy monitor, device calibration in TASMOTA is currently not supported.

PZEM004T,-Wemos-D1-Mini-and-a-1602-I2C-display.md

@@ -13,13 +13,13 @@
 ## Preparation
 **You need to compile your own Tasmota firmware as none of the pre-compiled binaries have support for _display and PZEM_ module.**  
 
-**Set up your preferred IDE as described in [wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/Flashing#flashing-and-compiling-from-source)**  
+**Set up your preferred IDE as described in [wiki](https://github.com/arendst/Tasmota/wiki/Flashing#flashing-and-compiling-from-source)**  
 
 ### Enable IDE to Use Custom Settings
 Create _**user_config_override.h**_ in the `sonoff` folder and paste the contents of this [sample configuration file](https://pastebin.com/WkfyKYnh).
 
 #### PlatformIO
-- Edit [_**platformio.ini**_](https://github.com/arendst/Sonoff-Tasmota/blob/development/platformio.ini). Uncomment the statement by removing the ";" in front of the line:  
+- Edit [_**platformio.ini**_](https://github.com/arendst/Tasmota/blob/development/platformio.ini). Uncomment the statement by removing the ";" in front of the line:  
   `-DUSE_CONFIG_OVERRIDE`  
 - Enter `platformio run -e <variant-name>`  
   Examples:  
@@ -27,7 +27,7 @@ Create _**user_config_override.h**_ in the `sonoff` folder and paste the content
   - `platformio run -e sonoff-DE`  
 
 #### Arduino IDE
-- Edit [_**my_user_config.h**_](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/my_user_config.h). Uncomment the statement by removing the "//" in front of the line:
+- Edit [_**my_user_config.h**_](https://github.com/arendst/Tasmota/blob/development/sonoff/my_user_config.h). Uncomment the statement by removing the "//" in front of the line:
   `#define USE_CONFIG_OVERRIDE`
 - Click compile
 
@@ -88,4 +88,4 @@ PZEM-004T v.3.0
 <img src="https://user-images.githubusercontent.com/21192010/51847858-d4eeff80-231c-11e9-9c13-41172a6924ee.png" height="400" />
 
 ## Calibration
-[Per Theo](https://github.com/arendst/Sonoff-Tasmota/issues/3208#issuecomment-405048466) - As the PZEM is a dedicated energy monitor, device calibration in TASMOTA is currently not supported.
+[Per Theo](https://github.com/arendst/Tasmota/issues/3208#issuecomment-405048466) - As the PZEM is a dedicated energy monitor, device calibration in TASMOTA is currently not supported.

PZEM004T-Energy-Monitor.md

@@ -57,4 +57,4 @@ Configure the GPIO's for hardware serial connection as shown below.
 
 
 ## Calibration
-[Per Theo](https://github.com/arendst/Sonoff-Tasmota/issues/3208#issuecomment-405048466) - As the PZEM is a dedicated energy monitor, device calibration in TASMOTA is currently not supported.
+[Per Theo](https://github.com/arendst/Tasmota/issues/3208#issuecomment-405048466) - As the PZEM is a dedicated energy monitor, device calibration in TASMOTA is currently not supported.

Peripherals.md

@@ -1,7 +1,7 @@
 You can connect peripherals (sensors, displays, switches, LED lights, ...) to available pins of the device. [Read here](Expanding-Tasmota) for more. 
 
 ### Supported peripherals
-More about [general configuration](https://github.com/arendst/Sonoff-Tasmota/wiki/Sensor-Configuration).
+More about [general configuration](https://github.com/arendst/Tasmota/wiki/Sensor-Configuration).
 
 *Some of the articles were written originally for D1 mini but the information still applies except the wiring instructions*
 - [**ADC**](ADC) - analog input over A0 pin  
@@ -39,7 +39,7 @@ More about [general configuration](https://github.com/arendst/Sonoff-Tasmota/wik
 - **MLX90614** - MLX IR Temperature sensor (I<sup>2</sup>C)
 - [**MPR121**](MPR121) - Proximity Capacitive Touch Sensor Controller (I<sup>2</sup>C)
 - **MPU6050** - 3-Axis Gyroscope and 3-Axis Accelerometer sensor (I<sup>2</sup>C)
-- [**P1 Energy Meter**](https://github.com/arendst/Sonoff-Tasmota/wiki/Wemos-D1-Mini-and-P1-Energy-Meter)
+- [**P1 Energy Meter**](https://github.com/arendst/Tasmota/wiki/Wemos-D1-Mini-and-P1-Energy-Meter)
 - [**PAJ7620**](PAJ7620) - Gesture & Proximity Detection Sensor
 - [**PCA9685**](PCA9685) - 16-channel, 12-bit PWM LED controller (I<sup>2</sup>C)
 - **PCF8574** 8-port I\/O Expander (I<sup>2</sup>C)
@@ -80,7 +80,7 @@ More about [general configuration](https://github.com/arendst/Sonoff-Tasmota/wik
   - [LEGO nightstand switch using Sonoff SV](https://jeff.noxon.cc/2018/11/21/lego-nightstand-light-switch/)
   - [Add a physical button to Sonoff Basic](https://translate.google.com/translate?hl=en&sl=auto&tl=en&u=https%3A%2F%2Fwww.domo-blog.fr%2Fajouter-un-bouton-physique-au-sonoff-basic%2F)
 - [Remote button for Sonoff](Control-a-Sonoff-using-a-remote-button)
-- [Expand Sonoff S20 with a jack plug](https://github.com/arendst/Sonoff-Tasmota/issues/670)
+- [Expand Sonoff S20 with a jack plug](https://github.com/arendst/Tasmota/issues/670)
 - [Expand Sonoff 4CH with a jack plug](Expanding-4CH)
 - [Modify KaKu to WKaKu Power Socket](Modify-KaKu-to-WKaKu-Power-Socket)
 - [GPIO Locations](GPIO-Locations)

PlatformIO-CLI.md

@@ -7,7 +7,7 @@ How to flash the Tasmota firmware onto a device using the `platformio` command l
 ## Install PlatformIO CLI
 `sudo pip install -U platformio`
 
-## Download the Sonoff-Tasmota source code
+## Download the Tasmota source code
 
 Either download the latest Tasmota Source code from https://github.com/arendst/Tasmota/ and extract it or clone the Git repository:  
 

PowStro.md

@@ -6,7 +6,7 @@ GND - GND
    
 ### Additional Information
 PowStro are fake Sonoff Basic, but they still work with Tasmota.   
-More Infos can be found here: [#1419](https://github.com/arendst/Sonoff-Tasmota/issues/1419).  
+More Infos can be found here: [#1419](https://github.com/arendst/Tasmota/issues/1419).  
      
 ### Device Images
 ![1](https://raw.githubusercontent.com/reloxx13/reloxx13.github.io/master/media/tasmota/PowStro/1.jpg)  

Prerequisites.md

@@ -13,7 +13,7 @@ The [power supplied to the device](https://www.letscontrolit.com/wiki/index.php?
 * [CH340G](https://cdn.sparkfun.com/datasheets/Dev/Arduino/Other/CH340DS1.PDF) is a reliable and very cheap adapter (example [1](https://www.sparkfun.com/products/14050), [2](https://www.aliexpress.com/item/1PCS-CH340-module-instead-of-PL2303-CH340G-RS232-to-TTL-module-upgrade-USB-to-serial-port/32761423124.html)).
 * [FTDI FT232](https://www.ftdichip.com/Products/ICs/FT232R.htm) - these adapters have a lot of fakes in the market so buy only from reliable sources ([example](https://www.sparkfun.com/products/13746)). Buy only the variant with a separate 3.3V regulator on PCB! 
 * [CP2102](https://www.silabs.com/documents/public/data-sheets/cp2102-9.pdf) or [PL2303](http://www.prolific.com.tw/UserFiles/files/ds_pl2303HXD_v1_4_4.pdf) - works with certain devices, but using an external 3.3V supply might be necessary. Not recommended for beginners!
-* [RaspberryPi](https://github.com/arendst/Sonoff-Tasmota/wiki/Flash-Sonoff-using-Raspberry-Pi) - only for advanced users. External 3.3V supply necessary.
+* [RaspberryPi](https://github.com/arendst/Tasmota/wiki/Flash-Sonoff-using-Raspberry-Pi) - only for advanced users. External 3.3V supply necessary.
 * [NodeMCU](https://en.wikipedia.org/wiki/NodeMCU) and [D1 mini](https://wiki.wemos.cc/products:d1:d1_mini) (Pro/Lite) boards have a micro USB upload port and don't require an adapter.
 <img src="https://user-images.githubusercontent.com/5904370/55688731-3f0acd00-597c-11e9-866c-d6ed7658ec4b.png" align=right></img>
 
@@ -39,7 +39,7 @@ Tasmota installed from a precompiled binary needs to be configured to work with
 ### Tasmota firmware
 Download a Tasmota binary (.bin) file. If you're not sure which binary is the right one for you consult the [builds table](Builds) or just start with `sonoff.bin`.
 
-The latest _**development**_ binary files are available on the [OTA server](http://thehackbox.org/tasmota). The latest merged development code is compiled hourly. The latest _**master**_ release binary files can be downloaded from [GitHub](https://github.com/arendst/Sonoff-Tasmota/releases) or from the [OTA server](http://thehackbox.org/tasmota/release/). 
+The latest _**development**_ binary files are available on the [OTA server](http://thehackbox.org/tasmota). The latest merged development code is compiled hourly. The latest _**master**_ release binary files can be downloaded from [GitHub](https://github.com/arendst/Tasmota/releases) or from the [OTA server](http://thehackbox.org/tasmota/release/). 
 
 ### Flashing tool
 - [**NodeMCU PyFlasher**](https://github.com/marcelstoer/nodemcu-pyflasher) - easy to use GUI flasher based on esptool.py. (Windows or Mac)

Python-HTTP-OTA-Server.md

@@ -9,7 +9,7 @@ To use this feature, firmware files need to be hosted on an HTTP web server (e.g
 
 Python makes available the [Flask (micro)framework](http://flask.pocoo.org) that can be used at different levels of complexity due to its modular architecture. [A simple HTTP server](http://flask.pocoo.org/docs/1.0/quickstart/#a-minimal-application) (hello-world) can be deployed with only *six* lines of Python code.  
 
-A Flask application to offer Tasmota firmware images for OTA upgrades is available as part of the available [tools](https://github.com/arendst/Sonoff-Tasmota/tree/development/tools/fw_server/).  
+A Flask application to offer Tasmota firmware images for OTA upgrades is available as part of the available [tools](https://github.com/arendst/Tasmota/tree/development/tools/fw_server/).  
 
 ## Requirements
 * Switching to superuser privileges and installing additional packages (and libraries) on a Linux/Windows box.
@@ -53,7 +53,7 @@ If your MQTT broker is hosted on a local server, you may want your firmware web
   $ sudo su
   # mkdir /srv/tasmota/fw_server/fw
   # cd /srv/tasmota/fw_server
-  # wget https://github.com/arendst/Sonoff-Tasmota/tree/development/tools/fw_server/fw-server.py
+  # wget https://github.com/arendst/Tasmota/tree/development/tools/fw_server/fw-server.py
   ```
 - Create a new file named `tasmota.service` in `/etc/systemd/system/` and paste these lines (replace `XYZ` by your username):  
   ```

RGB-Smart-Plug-16A.md

@@ -106,7 +106,7 @@ _One of my devices had a hardware issue - constantly losing WiFi, rebooted when
 [[https://raw.githubusercontent.com/wiki/Astr0/Sonoff-Tasmota/images/lonsonho16a/relay.jpg|Relay]]
 [[https://raw.githubusercontent.com/wiki/Astr0/Sonoff-Tasmota/images/lonsonho16a/relay2.jpg|Relay2]]
 I figured out the pinout for flashing the device:
-![Pinout](https://github.com/iroger/Sonoff-Tasmota/blob/master/relay.jpg?raw=true)
+![Pinout](https://github.com/iroger/Tasmota/blob/master/relay.jpg?raw=true)
 
 * Before assembling it back remove as much solder as possible from input and output pole pads. The device fits together very tight, so everything should be perfectly in place. Don't forget to glue the case back.
 

Rules---IF-ELSE-ELSEIF-and-AND-OR-Support.md

@@ -27,7 +27,7 @@ Note: All the commands executed _**within an IF block**_ are performed via `Back
 - `<statement>` {`;` `<statement>`}  
 
 `<statement>`  
-- {`<Sonoff-Tasmota-command>` | `<if-statement>`}  
+- {`<Tasmota-command>` | `<if-statement>`}  
 
 ## In English
 IF statement supports 3 formats:  
@@ -55,9 +55,9 @@ Parenthesis can be used to change the priority of logical expression. For exampl
   SUNSET|current sunset time (minutes past midnight)
 
 `<statement-list>`  
-- A Sonoff-Tasmota command (e.g.,`LedPower on`)  
+- A Tasmota command (e.g.,`LedPower on`)  
 - Another IF statement (`IF ... ENDIF`)  
-- Multiple Sonoff-Tasmota commands or IF statements separated by `;`. For example:  
+- Multiple Tasmota commands or IF statements separated by `;`. For example:  
   `Power1 off; LedPower on; IF (Mem1==0) Var1 Var1+1; Mem1 1 ENDIF; Delay 10; Power1 on`  
   `Backlog` is implied and is not required (saves rule set buffer space).  
 

S1-Series---Wifi-Socket-S120-(EU-model)-chipset-TYWE2S.md

@@ -9,7 +9,7 @@ As chipset is a **TYWE2S**, you'll have to connect GPIO0 (marked IO0) manually t
 
 ![](https://i.imgur.com/GZkFNWQ.jpg)
 
-There's better images than mines [here](https://github.com/arendst/Sonoff-Tasmota/wiki/CE-Smart-Home---LA-WF3-Wifi-Plug-(TYWE2S)) and [here](https://github.com/arendst/Sonoff-Tasmota/wiki/4CH-Wifi-Socket-with-USB-Charger-SA-P402A-(TYWE2S)) on the wiki.
+There's better images than mines [here](https://github.com/arendst/Tasmota/wiki/CE-Smart-Home---LA-WF3-Wifi-Plug-(TYWE2S)) and [here](https://github.com/arendst/Tasmota/wiki/4CH-Wifi-Socket-with-USB-Charger-SA-P402A-(TYWE2S)) on the wiki.
 
 ### Configuration
 

Sensor-API.md

@@ -22,8 +22,8 @@ This wiki page is an attempt to document the Tasmota sensor API for sensor drive
 If you plan to submit a PR bigger than a simple change in one file, here is a short intro about how to do a clean PR.
 
 - fork the Tasmota repository in Github
-- `git clone https://github.com/<github_user>/Sonoff-Tasmota.git` and work on your local copy
+- `git clone https://github.com/<github_user>/Tasmota.git` and work on your local copy
-- `git remote add upstream https://github.com/arendst/Sonoff-Tasmota.git`
+- `git remote add upstream https://github.com/arendst/Tasmota.git`
 - `git checkout development`
 - `git checkout -b <temp_branch>` to create a working branch where you can push commits
 - `git push --set-upstream origin <temp_branch>`

Sensor-Configuration.md

@@ -1,6 +1,6 @@
 Pre-work:
-* [Device Configuration](https://github.com/arendst/Sonoff-Tasmota/wiki/Initial-Configuration)
+* [Device Configuration](https://github.com/arendst/Tasmota/wiki/Initial-Configuration)
-* [How To Connect a Sensor](https://github.com/arendst/Sonoff-Tasmota/wiki/Expanding-Tasmota) 
+* [How To Connect a Sensor](https://github.com/arendst/Tasmota/wiki/Expanding-Tasmota) 
 
 The software allows for easy configuration of sensors and devices to selected GPIO pins. Depending on the type of Template/Module, certain GPIO pins are user configurable. Sensor configuration is possible by either the WebUI or using the commands [`Template`](Commands#template), [`Module`](Commands#module) or  [`GPIO`](Commands#gpio).
 

SetOption36.md

@@ -1,3 +1,3 @@
-SetOption36 is deprecated in favour of using the sleep command to use either Dynamic or Normal sleep as from Sonoff-Tasmota version 6.3.0.15.
+SetOption36 is deprecated in favour of using the sleep command to use either Dynamic or Normal sleep as from Tasmota version 6.3.0.15.
 
-[Click here to see the updated Wiki for Dynamic Sleep](https://github.com/arendst/Sonoff-Tasmota/wiki/Dynamic%20Sleep)
+[Click here to see the updated Wiki for Dynamic Sleep](https://github.com/arendst/Tasmota/wiki/Dynamic%20Sleep)

Shelly-1.md

@@ -24,7 +24,7 @@ Shelly1 comes with a partially exposed programming/debug header which can be use
 <img src="https://github.com/arendst/arendst.github.io/blob/master/media/shelly/shelly1_pinout-800x433.jpg" height="250" />
 
 ## Flash mode
-To be able to flash the Tasmota firmware you need to get into flash mode. Therefore connect a wire from GPIO0 to ground. For further information have a look at [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation#bringing-the-module-in-flash-mode).
+To be able to flash the Tasmota firmware you need to get into flash mode. Therefore connect a wire from GPIO0 to ground. For further information have a look at [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation#bringing-the-module-in-flash-mode).
 
 ## **⚠️️WARNING⚠️️**
 Please note what version of the Shelly 1 you have (V1, V2 or V3). The V2 user guide is [incorrect](https://gallery.mailchimp.com/0d9bf8d9ddf1b29f33cb71ba5/images/cb16c7b5-5887-4ef2-b6c1-6e90ccaf648a.png?mc_cid=0a274764f3&mc_eid=05c10a130f). The mains connections are as shown in the image above for all versions of the switch. The labels on the V2 switches are [wrong](https://gallery.mailchimp.com/0d9bf8d9ddf1b29f33cb71ba5/images/cb16c7b5-5887-4ef2-b6c1-6e90ccaf648a.png?mc_cid=0a274764f3&mc_eid=05c10a130f)!

Shelly-2.5.md

@@ -4,7 +4,7 @@ The Shelly 2.5 is supported from Tasmota 6.5.0.8 using a template.
 
 * [Allterco Shelly 2.5 Product Page](https://shelly.cloud/shelly-25-wifi-smart-relay-roller-shutter-home-automation/)
 * [Allterco Shelly 2.5 Shop](https://shelly.cloud/product/wifi-smart-home-automation-shelly-25-switch-relay-roller-shutter/)
-* [Shelly 2.5 Initial issue](https://github.com/arendst/Sonoff-Tasmota/issues/5592)
+* [Shelly 2.5 Initial issue](https://github.com/arendst/Tasmota/issues/5592)
 
 ## ⚠️️Special Shelly Attention⚠️️
 
@@ -59,7 +59,7 @@ If you connect momentary switches and want press/double press/hold functionality
 Run `Backlog SetOption1 1; SetOption11 1; SetOption32 1` to enable all three states. `Button1` is the button on the back of the device next to the pin header. `Button2` and `Button3` are assigned to the SW1 and SW2 external inputs.
 
 ## Flash mode
-To be able to flash the Tasmota firmware you need to get into flash mode. Therefore connect a wire from GPIO0 to ground. For further information have a look at [bringing-the-module-in-flash-mode](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation#bringing-the-module-in-flash-mode).
+To be able to flash the Tasmota firmware you need to get into flash mode. Therefore connect a wire from GPIO0 to ground. For further information have a look at [bringing-the-module-in-flash-mode](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation#bringing-the-module-in-flash-mode).
 
 ## Calibration
 Tasmota will disable serial logging after a restart as the communication between Tasmota and the Energy Monitoring chip is using the same serial interface. Make sure not to enable `SerialLog` as it will interfere with the Energy Monitoring functionality.
@@ -88,4 +88,4 @@ You might want to experiment with the switch debounce delay. It is set to 50 mil
 
 Use command `SwitchDebounce 100` to change it to a less sensitive value, which might work better. The value be set up to 1000 milliseconds.
 
-Some issues were reported for this topic - [search query](https://github.com/arendst/Sonoff-Tasmota/issues?utf8=%E2%9C%93&q=ghost+shelly)
+Some issues were reported for this topic - [search query](https://github.com/arendst/Tasmota/issues?utf8=%E2%9C%93&q=ghost+shelly)

Shelly-2.md

@@ -29,4 +29,4 @@ The shelly 2 inputs may or may not need pullups for SW1 and SW2 to work correctl
 
 To disable pullups either use command SetOption62 1 or select the option from the GUI.
 
-Refer to the following issue: https://github.com/arendst/Sonoff-Tasmota/issues/4841
+Refer to the following issue: https://github.com/arendst/Tasmota/issues/4841

Slitinto-NX-SP202.md

@@ -25,7 +25,7 @@ Nevertheless one user described a method to "crack" it using a rubber hammer and
 Not known.
 
 ## Procedure
-[Here](https://github.com/arendst/Sonoff-Tasmota/issues/3950) is described how to crack the device but also how to flash it OTA.
+[Here](https://github.com/arendst/Tasmota/issues/3950) is described how to crack the device but also how to flash it OTA.
 
 # Miscellaneous
 I use metering capable devices to observe the power consumption and execute rule based behaviour on base of the consumption values.

SmartHome.md

@@ -6,7 +6,7 @@ GND - GND
    
 ### Additional Information
 SmartHome is a cheap Sonoff Basic clone, but they still work with Tasmota.   
-More Infos can be found here: [#1474](https://github.com/arendst/Sonoff-Tasmota/issues/1474).  
+More Infos can be found here: [#1474](https://github.com/arendst/Tasmota/issues/1474).  
      
 ### Device Images
 ![1](https://user-images.githubusercontent.com/34961418/34454555-fabcb5ee-ed6d-11e7-9639-e038732a4c1c.jpg)  

SonOTA-(doesnt-work-anymore-with-actual-firmwares!).md

@@ -1,6 +1,6 @@
 How to setup and configure SonOTA for Tasmota upload. There basically two ways to install via SonOTA:
 * With compiling: You can compile the different components as intended, setting the compile flags to match your installation. This will allow to be faster at setting up lots of devices, as you will have to do less reconfiguration after Tasmota install.
-* Quick and dirty (and easy): [installation from unmodified binaries](https://github.com/arendst/Sonoff-Tasmota/wiki/SonOTA---Espressif2Arduino---Tasmota-without-compiling) without needing to compile anything or install SDKs, but having to adjust a temporary wifi with some predefined credentials / SSIDs - see the [SonOTA](https://github.com/mirko/SonOTA) for more information.
+* Quick and dirty (and easy): [installation from unmodified binaries](https://github.com/arendst/Tasmota/wiki/SonOTA---Espressif2Arduino---Tasmota-without-compiling) without needing to compile anything or install SDKs, but having to adjust a temporary wifi with some predefined credentials / SSIDs - see the [SonOTA](https://github.com/mirko/SonOTA) for more information.
 
 # With compiling
 ## Download SonOTA
@@ -11,7 +11,7 @@ Download SonOTA from
 ## Install SonOTA
 
 ## Download Tasmota
-Download the latest Tasmota release from https://github.com/arendst/Sonoff-Tasmota/releases and unzip to a known folder.
+Download the latest Tasmota release from https://github.com/arendst/Tasmota/releases and unzip to a known folder.
 
 ## Configure SonOTA
 

SonOTA---Espressif2Arduino---Tasmota-without-compiling.md

@@ -84,7 +84,7 @@ SonOTA should say something like:
 }
 (DEBUG) ~~~ device acknowledged our action request (seq 150393500xxxx) with error code 0
 ```
-* Now, the device is connecting to your *temporary* Wifi and downloading minimal Sonoff-Tasmota image. This can take some time (2 minutes), after which device will reset and connect back to temporary Wifi.
+* Now, the device is connecting to your *temporary* Wifi and downloading minimal Tasmota image. This can take some time (2 minutes), after which device will reset and connect back to temporary Wifi.
 * Connect your PC to the *temporary* Wifi
 * Use NMAP to find the device's IP (or use Fing in Android):
 ```

SonWEB.md

@@ -1 +1 @@
-Moves to [TasmoAdmin](https://github.com/arendst/Sonoff-Tasmota/wiki/TasmoAdmin)
+Moves to [TasmoAdmin](https://github.com/arendst/Tasmota/wiki/TasmoAdmin)

Sonoff-4CH-DIY.md

@@ -11,7 +11,7 @@ The Sonoff 4CH DIY is based on the ESP8285.
 
 ### Sonoff 4CH DIY
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 As always, you need to access the serial interface. The **four serial pins** (3V3, Rx, Tx, GND) can be seen in the picture.
 

Sonoff-4CH-Pro.md

@@ -18,7 +18,7 @@ Use the ESP programming header as described in the picture to upload the firmwar
 <img title="Sonoff 4CH Pro programming" src="https://github.com/arendst/arendst.github.io/blob/master/media/4chpro_gpio0.JPG?raw=true" width="100%" align="middle" />
 
 ### Sonoff 4CH Pro R2
-On the R2 module the GPIO0 pin is broken out to [a small pad to the right of the ESP package](https://github.com/arendst/Sonoff-Tasmota/issues/2021#issuecomment-371227748):
+On the R2 module the GPIO0 pin is broken out to [a small pad to the right of the ESP package](https://github.com/arendst/Tasmota/issues/2021#issuecomment-371227748):
 
 <img title="R2 module - GPIO0 pad" src="https://user-images.githubusercontent.com/3594528/37109801-58fb97a4-223b-11e8-969c-1131dcfa6ee1.jpg" align="middle" />
 

Sonoff-B1.md

@@ -1,8 +1,8 @@
-Sonoff B1 R2 is the replacement for Sonoff B1 and can be programmed the same way as the B1. See [here](https://github.com/arendst/Sonoff-Tasmota/issues/3347#issuecomment-413579744) for more background information.
+Sonoff B1 R2 is the replacement for Sonoff B1 and can be programmed the same way as the B1. See [here](https://github.com/arendst/Tasmota/issues/3347#issuecomment-413579744) for more background information.
 
 ## Serial Flashing
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 As always, you need to access the serial interface. First pop up the top part of the bulb with controlled force. The PCB as shown in the image will become visible.
 

Sonoff-Basic.md

@@ -2,7 +2,7 @@ Sonoff Basic - the one that started it all!
 
 ## Serial Flashing
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 <img alt="Sonoff Basic connection diagram" src="https://user-images.githubusercontent.com/2870104/30516551-ed12d69e-9b42-11e7-8373-1bfbbf346839.png" width="50%" align="right" />
 
@@ -10,7 +10,7 @@ You need to access the serial interface. The **four serial pins** (3V3, Rx, Tx,
 
 For flashing the Sonoff Basic, hold the button while connecting the 3.3V power. The LED remains off until the flashing process is done and the board is rebooted.
 
-If your switch is powering up but is showing a solid-blink-reset pattern see [this FAQ entry for advice](https://github.com/arendst/Sonoff-Tasmota/wiki/Troubleshooting#running-out-of-memory).
+If your switch is powering up but is showing a solid-blink-reset pattern see [this FAQ entry for advice](https://github.com/arendst/Tasmota/wiki/Troubleshooting#running-out-of-memory).
 
 - GPIO00 - BUTTON
 - GPIO12 - RELAY
@@ -31,7 +31,7 @@ This version of the device supports the new [Itead DIY architecture](https://www
 The serial interface pins are broken out on the PCB making flashing using a serial adapter as well. Since the underside of the contacts is not easily reachable, use a solderless solution (i.e., friction) to maintain contact with the pins to flash the device.
 
 ## Sonoff Basic R2
-Around November 2018, Itead changed the layout of the Sonoff Basic ([issue #4515](https://github.com/arendst/Sonoff-Tasmota/issues/4515)). The new board is labeled as **Sonoff RF R2 POWER V1.0**. It is easily discerned from previous revisions since it uses wires instead of thick solder traces for mains power.
+Around November 2018, Itead changed the layout of the Sonoff Basic ([issue #4515](https://github.com/arendst/Tasmota/issues/4515)). The new board is labeled as **Sonoff RF R2 POWER V1.0**. It is easily discerned from previous revisions since it uses wires instead of thick solder traces for mains power.
 
 The new version of the Sonoff Basic smart switch uses an ESP8285 SoC with the 1MB flash integrated into the same SoC chip.
 

Sonoff-DIY.md

@@ -32,7 +32,7 @@ As Sonoff DIY is enabled by connecting GPIO16 to GND it may well be possible tha
 - Select `Firmware flash` (`Brush machine` on newer versions of the tool)
 - Select a Tasmota binary (e.g., [`sonoff-basic.bin`](http://thehackbox.org/tasmota/020300/sonoff-basic.bin)) or your own self-compiled binary. It must fit in the available free program space. You can use the 2.3.0 Core for this initial flash since it has the smallest program memory footprint. _**Do NOT use the sonoff-minimal pre-compiled binary**_ as it does not allow you to change any settings.
   
-  > You may wish to [compile your own firmware](https://github.com/arendst/Sonoff-Tasmota/wiki/Compiling-Tasmota-on-Gitpod) with all the features you require and disabling the features you do not. This will usually result in a "full" binary that is under 500k. You can use the resulting firmware file instead of the pre-compiled `sonoff-basic.bin`.  
+  > You may wish to [compile your own firmware](https://github.com/arendst/Tasmota/wiki/Compiling-Tasmota-on-Gitpod) with all the features you require and disabling the features you do not. This will usually result in a "full" binary that is under 500k. You can use the resulting firmware file instead of the pre-compiled `sonoff-basic.bin`.  
 - Select the device in the flash pop-up and then select OK
 - Tasmota will be uploaded and started
 
@@ -51,7 +51,7 @@ This procedure is recommended for MacOS, but also works for Linux.
 - `sonoffDiy` SSID on your local network. Use a router/access point or configure your laptop/smartphone as a hotspot with the proper SSID and password.
 - A `<webServer>` available on the same local network. Very simple web servers like `SimpleHTTPServer` will not work. For Mac, the [OSX built-in web server](Mac-OSX-Local-Web-Server-for-Tasmota-Firmware-Binaries) is recommended.  
 - A Tasmota binary (e.g., [`sonoff-basic.bin`](http://thehackbox.org/tasmota/020300/sonoff-basic.bin)) or your own self-compiled binary. It must fit in the available free program space. You can use the 2.3.0 Core for this initial flash since it has the smallest program memory footprint. _**Do NOT use the sonoff-minimal pre-compiled binary**_ as it does not allow you to change any settings.
-  >You may wish to [compile your own firmware](https://github.com/arendst/Sonoff-Tasmota/wiki/Compiling-Tasmota-on-Gitpod) with all the features you require and disabling the features you do not. This will usually result in a "full" binary that is under 500k. You can use the resulting firmware file instead of the pre-compiled `sonoff-basic.bin`. This way you will not have to perform the secondary OTA firmware update. _**Nevertheless, it is still recommended that you perform a `Reset 5` immediately after the Sonoff DIY flash completes.**_  
+  >You may wish to [compile your own firmware](https://github.com/arendst/Tasmota/wiki/Compiling-Tasmota-on-Gitpod) with all the features you require and disabling the features you do not. This will usually result in a "full" binary that is under 500k. You can use the resulting firmware file instead of the pre-compiled `sonoff-basic.bin`. This way you will not have to perform the secondary OTA firmware update. _**Nevertheless, it is still recommended that you perform a `Reset 5` immediately after the Sonoff DIY flash completes.**_  
 
   Upload the firmware file to the `<webServer>` available on the same local network.  
 - SHA256 `<SHAsum>` of firmware binary file  

Sonoff-Dual-R2.md

@@ -5,7 +5,7 @@ Sonoff Dual R2 is the replacement for Sonoff Dual. Compared to the Dual the main
 
 ## Serial Flashing
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 As always, you need to access the serial interface. VCC, RX, TX and GND are available at the bottom left end of the PCB in the image below.
 ![](https://user-images.githubusercontent.com/5904370/57879391-a7bb5400-781c-11e9-96d4-ea7b87fc3274.png)
@@ -30,9 +30,9 @@ Note 2: GPIO9 and 10 can be safely used with an external switch (even rebooting
 
 ### Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
-As always, you need to access the serial interface. The **four serial pins** (3V3, Rx, Tx, GND) are available at the short end of the PCB and can be seen on the left side of the first image and are labeled in red on the second image. For the v2.0 version of the board you need to cross-over the serial interface, see [troubleshooting](https://github.com/arendst/Sonoff-Tasmota/wiki/Troubleshooting).
+As always, you need to access the serial interface. The **four serial pins** (3V3, Rx, Tx, GND) are available at the short end of the PCB and can be seen on the left side of the first image and are labeled in red on the second image. For the v2.0 version of the board you need to cross-over the serial interface, see [troubleshooting](https://github.com/arendst/Tasmota/wiki/Troubleshooting).
 
 <img alt="Sonoff Dual, GPIO0 grounded" src="https://github.com/arendst/arendst.github.io/blob/master/media/dual2a.jpg" width="48%" />
 <img alt="Alternate GPIO0 spot" src="http://tinkerman.cat/wp-content/uploads/2016/12/20161206_234331s.jpg" width="48%" align="right" />
@@ -47,7 +47,7 @@ Programming the Sonoff Dual is more difficult because the on-board-button is not
 
 Please be aware, that the button on the Sonoff Dual will initially not have any functionality!
 
-Other than on most Sonoff module the button is not connected to the normal button pin (GPIO0). After freshly flashing Sonoff-Tasmota (with the default module setting "Sonoff Basic"), the button will **not act as described** in the [Button Usage](https://github.com/arendst/Sonoff-Tasmota/wiki/Button-usage) article. You will not be able to switch power or activate the special WiFi modes.
+Other than on most Sonoff module the button is not connected to the normal button pin (GPIO0). After freshly flashing Tasmota (with the default module setting "Sonoff Basic"), the button will **not act as described** in the [Button Usage](https://github.com/arendst/Tasmota/wiki/Button-usage) article. You will not be able to switch power or activate the special WiFi modes.
 
 **Possible Workarounds:** Take advantage of the default WiFi fallback behavior, which is to connect via [WPS](https://en.wikipedia.org/wiki/Wi-Fi_Protected_Setup) or configure the module firmware config beforehand via `user_config_override.h`.
 

Sonoff-Dual.md

@@ -1,7 +1,7 @@
 Sonoff Dual has been obsoleted by [Sonoff Dual R2](https://blakadder.github.io/sonoff_dual_R2.html). Before configuring your device check which revision you have since there are significant differences in how they operate.
 
 ## Serial Flashing
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 As always, you need to access the serial interface. The **four serial pins** (3V3, Rx, Tx, GND) are available at the short end of the PCB and can be seen on the left side of the first image and are labeled in red on the second image.
 
@@ -19,7 +19,7 @@ GND can be found on all three headers. *GPIO0* can be accessed in two ways:
 
 Please be aware, that the button on the Sonoff Dual will initially not have any functionality!
 
-The button is not connected to the normal button pin (GPIO0). After freshly flashing Sonoff-Tasmota (with the default module setting "Sonoff Basic"), the button will **not act as described** in the [Button Usage](https://github.com/arendst/Sonoff-Tasmota/wiki/Button-usage) article. You will not be able to switch power or activate the special WiFi modes.
+The button is not connected to the normal button pin (GPIO0). After freshly flashing Tasmota (with the default module setting "Sonoff Basic"), the button will **not act as described** in the [Button Usage](https://github.com/arendst/Tasmota/wiki/Button-usage) article. You will not be able to switch power or activate the special WiFi modes.
 
 After configuring the device as "Sonoff Dual (5)", the button will regain normal functionality.
 

Sonoff-Pow-R2.md

@@ -12,7 +12,7 @@ The GPIOs on the Pow are connected to AC power!** Only use a POW R2 as designed.
 
 ## Serial Flashing 
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 3V3, RX, TX and GND pins are available at the rear/short end of the PCB.
 
@@ -29,7 +29,7 @@ Serial logging is disabled by the Tasmota code for this module. Serial communica
 [![](http://img.youtube.com/vi/fqOJjA6Pph0/0.jpg)](http://www.youtube.com/watch?v=fqOJjA6Pph0 "")
 
 ## Power Monitoring Calibration
-Sonoff Pow R2 might need calibration as correct measurements are influenced by hardware and timing differences. See [Power Monitoring Calibration](https://github.com/arendst/Sonoff-Tasmota/wiki/Power-Monitoring-Calibration)
+Sonoff Pow R2 might need calibration as correct measurements are influenced by hardware and timing differences. See [Power Monitoring Calibration](https://github.com/arendst/Tasmota/wiki/Power-Monitoring-Calibration)
    
 ## Telemetry
 The Sonoff Pow R2 can provide Energy, Power, Voltage and Current information in different ways.

Sonoff-Pow.md

@@ -14,7 +14,7 @@ The GPIOs on the Pow are connected to AC power!** Only use a POW as designed.
 
 ## Serial Connection 
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 3V3, RX, TX and GND pins are available at the rear end of the PCB.
 
@@ -23,7 +23,7 @@ Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/
 To enter **flash mode**, press down on the button while powering the device.
 
 ## Power Monitoring Calibration
-Sonoff Pow might need calibration as correct measurements are influenced by hardware and timing differences. See [Power Monitoring Calibration](https://github.com/arendst/Sonoff-Tasmota/wiki/Power-Monitoring-Calibration)
+Sonoff Pow might need calibration as correct measurements are influenced by hardware and timing differences. See [Power Monitoring Calibration](https://github.com/arendst/Tasmota/wiki/Power-Monitoring-Calibration)
    
 ## Telemetry
 The Sonoff Pow can provide Energy, Power, Voltage and Current information in different ways.
@@ -66,7 +66,7 @@ It is, in fact,  possible to set a Maximum Power Threshold for the Sonoff Pow.
 
  If the power measured by the device exceeds the threshold set by the command `MaxPower` for a number of seconds set by the command `MaxPowerHold` the device will remain switched off for `MaxPowerWindow` seconds (to let it cool down, for example).
 
-For all details see [issue #218](https://github.com/arendst/Sonoff-Tasmota/issues/218)
+For all details see [issue #218](https://github.com/arendst/Tasmota/issues/218)
 
 ## Official Sources
 

Sonoff-RF-Bridge-433.md

@@ -2,11 +2,11 @@
 
 In addition to the ESP8266, the bridge has an *RF chip* (433MHz) for which there is a custom firmware commonly referred to as 'Portisch'. The original Sonoff RF firmware is limited to mostly just Sonoff RF devices (a single 24-bit RF protocol). By updating the firmware on the RF chip (EFM8BB1 MCU), new features and types of devices become usable. Tasmota supports the original Sonoff RF firmware and [Portisch firmware](https://github.com/Portisch/RF-Bridge-EFM8BB1).
 
-The RF upgrade requires wiring the bridge and then flashing the firmware via Sonoff-Tasmota Web UI ([details below](#rf-firmware-upgrade)).
+The RF upgrade requires wiring the bridge and then flashing the firmware via Tasmota Web UI ([details below](#rf-firmware-upgrade)).
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 As always, you need to access the serial interface. The **four serial pins** (3V3, RX, TX, GND) connected to the ESP8285 are available on the 5-pin header just next to the switch as can be seen in the image.
 
@@ -20,13 +20,13 @@ After programming make sure to move the switch away from the 5-pin header to res
 [![](http://img.youtube.com/vi/XixXbg2T4Ns/0.jpg)](http://www.youtube.com/watch?v=XixXbg2T4Ns "")
 
 ## Operation
-During normal operation the serial interface is used at 19200 baud to communicate with the RF microcontroller. It is therefore wise to disable serial logging ([`SerialLog 0`](https://github.com/arendst/Sonoff-Tasmota/wiki/Commands#seriallog)).
+During normal operation the serial interface is used at 19200 baud to communicate with the RF microcontroller. It is therefore wise to disable serial logging ([`SerialLog 0`](https://github.com/arendst/Tasmota/wiki/Commands#seriallog)).
 
 The bridge is able to learn up to 16 different remote control commands of fixed code at 433 MHz frequency as provided by PT2260, PT2262, PT2264 and EV1527 transmitters. It was not able to recognize the latest Klik Aan Klik Uit (KaKu) remote control signals but some people managed to use the fixed code KaKu devices like PAR-1000 receiver and PAT-103 transmitter.
 
 Tasmota provides default remote control commands to all 16 keys so you can start using the bridge with a Sonoff 4CH Pro or Sonoff RF device without having the bridge have to learn remote control commands.
 
-See [RF Commands](https://github.com/arendst/Sonoff-Tasmota/wiki/Commands#sonoff-rf-bridge) for Sonoff RF Bridge 433 specific commands.
+See [RF Commands](https://github.com/arendst/Tasmota/wiki/Commands#sonoff-rf-bridge) for Sonoff RF Bridge 433 specific commands.
 
 **IMPORTANT:** In the Module configuration GPIO4 and GPIO5 must be left as **`00 None`**
 
@@ -60,11 +60,11 @@ The R2 revision boards connect the GPIO4 and GPIO5 pins to the USB data lines of
 5. Power up the bridge via the 3.3V & GND pins. (See below if you need to power the device through the USB power port)
 6. Go to the Web UI **Firmware Upgrade** > **Upgrade by File Upload** (introduced in v6.0.0a)
 7. Download the Portisch Firmware: <br>(Downloading them from the GitHub web site does **not** work since it will download the GitHub preview/content of the file)
-   1. Download the entire contents of the [Tasmota GitHub project](https://github.com/arendst/Sonoff-Tasmota/tree/master/) project via the green `Clone or Download` button to ensure that the firmware hex files are downloaded properly. The firmware files are located in the `./tools/fw_efm8bb1/` folder. **Select the newest available hex file. Otherwise you may get `error "Magic byte is not 0xE9"`**.
+   1. Download the entire contents of the [Tasmota GitHub project](https://github.com/arendst/Tasmota/tree/master/) project via the green `Clone or Download` button to ensure that the firmware hex files are downloaded properly. The firmware files are located in the `./tools/fw_efm8bb1/` folder. **Select the newest available hex file. Otherwise you may get `error "Magic byte is not 0xE9"`**.
-   2. As an alternative use wget/curl or PowerShell to download the raw file (https://github.com/arendst/Sonoff-Tasmota/tree/master/tools/fw_efm8bb1) directly. **Select the newest available hex file. Otherwise you may get `error "Magic byte is not 0xE9"`**.  
+   2. As an alternative use wget/curl or PowerShell to download the raw file (https://github.com/arendst/Tasmota/tree/master/tools/fw_efm8bb1) directly. **Select the newest available hex file. Otherwise you may get `error "Magic byte is not 0xE9"`**.  
       PowerShell example:
       ```
-      wget https://github.com/arendst/Sonoff-Tasmota/raw/master/tools/fw_efm8bb1/RF-Bridge-EFM8BB1-XXXXXXXX.hex -OutFile .\RF-Bridge-EFM8BB1-XXXXXXXX.hex
+      wget https://github.com/arendst/Tasmota/raw/master/tools/fw_efm8bb1/RF-Bridge-EFM8BB1-XXXXXXXX.hex -OutFile .\RF-Bridge-EFM8BB1-XXXXXXXX.hex
       ```
 8. In the file selection dialog, navigate to the folder on your computer where you saved the hex file.
 9. Hit **Start Upgrade**. The flashing should complete within 60 seconds. Device will restart after upgrade completes.
@@ -86,7 +86,7 @@ Example using MQTT:
 ```
 cmnd/sonoffRFBridge/Backlog RfRaw AAB0210314016703F924180101011001100110010101100110011001010110010101100255; RfRaw 0
 ```
-Refer to [issue #3973](https://github.com/arendst/Sonoff-Tasmota/issues/3973) for further information.
+Refer to [issue #3973](https://github.com/arendst/Tasmota/issues/3973) for further information.
 
 
 ### B1 to B0 Conversion Tools
@@ -183,5 +183,5 @@ After learning how bitbucket works from  the [Portisch wiki](https://github.com/
 * [Itead Product Page](http://sonoff.itead.cc/en/products/appliances/sonoff-rf-bridge-433)
 * [Itead Shop](https://www.itead.cc/sonoff-rf-bridge-433.html)
 * [Itead Wiki](https://www.itead.cc/wiki/Sonoff_RF_Bridge_433)
-* [How to Flash the RF Bridge](https://github.com/arendst/Sonoff-Tasmota/wiki/How-to-Flash-the-RF-Bridge)   
+* [How to Flash the RF Bridge](https://github.com/arendst/Tasmota/wiki/How-to-Flash-the-RF-Bridge)   
-* [RF Bridge 433 R2 Information](https://github.com/arendst/Sonoff-Tasmota/issues/1916)
+* [RF Bridge 433 R2 Information](https://github.com/arendst/Tasmota/issues/1916)

Sonoff-S20.md

@@ -2,7 +2,7 @@ Sonoff S20 comes in 4 different plug type variations. Flashing process will be t
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 <img alt="S20 Smart Socket" src="https://github.com/arendst/arendst.github.io/blob/master/media/s20b.jpg?raw=true" width="230" align="right" /> 
 The picture shows how to program the S20 Smart Socket powered by the serial-to-USB converter.  With newer US sockets, either use a right-angle header, or remove the header after flashing.  Otherwise,the pushbutton may rub against a pin and get stuck.

Sonoff-S26-Smart-Socket.md

@@ -3,7 +3,7 @@
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 ## LED State
 
@@ -52,4 +52,4 @@ Running Tasmota 6.1.1 the unit reports:
 
 ## More information
 
-See issue [#2808](https://github.com/arendst/Sonoff-Tasmota/issues/2808) for user information
+See issue [#2808](https://github.com/arendst/Tasmota/issues/2808) for user information

Sonoff-T1.md

@@ -9,7 +9,7 @@ Based on the ESP8285, but using a Silabs EFM8BB1 microcontroller to extend the n
 * [SYN470R Data Sheet](https://www.birdandgua.net/bird/wp-content/uploads/2016/09/SYN470R-Synoxo.pdf)
 ## Read before flashing
 Tasmota has functionality to perform special actions on multiple button presses and long press for 40 seconds resets firmware to default. This will cause the T1 board to reset if relay board is not connected, because long press on Button1 will be detected.
-**To avoid this, use command [`SetOption13 1`](https://github.com/arendst/Sonoff-Tasmota/wiki/Commands#setoption13) immediately after flashing Tasmota.**
+**To avoid this, use command [`SetOption13 1`](https://github.com/arendst/Tasmota/wiki/Commands#setoption13) immediately after flashing Tasmota.**
 
 When powered solely with 3.3v from the serial-to-USB adapter long press will be detected by Tasmota on Button1.
 

Sonoff-TX-Series.md

@@ -4,7 +4,7 @@ The boards are the same for all the series with only a difference in the T0 whic
 
 # Flashing
 
-The flashing steps are the same than for the [older T1 switch](https://github.com/arendst/Sonoff-Tasmota/wiki/Sonoff-T1) but holding switch 1 does not put the board into flashing mode and there is no reset button on the board
+The flashing steps are the same than for the [older T1 switch](https://github.com/arendst/Tasmota/wiki/Sonoff-T1) but holding switch 1 does not put the board into flashing mode and there is no reset button on the board
 
 So to put a T1 Touch v1.0 board into flash mode you need to ground GPIO 0 which is exposed on the back of the board and plug the board to USB
 

Sonoff-Touch.md

@@ -7,7 +7,7 @@ Unlike most Sonoff modules, the Sonoff Touch is based on the ESP8285 rather than
 
 ## Serial Connection
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 As always, you need to access the serial interface. Carefully remove the top PCB from the assembly. The hidden underside of the PCB contains the ESP8285 as shown in the pictures. The **four serial pins** (3V3, Rx, Tx, GND) can be seen in the pictures for the US version (left) and the EU version (right) of the module PCB.
 

Sonoff-iFan02.md

@@ -6,7 +6,7 @@ The Sonoff iFan02 is supported in Tasmota from version 6.0.0b
 
 ## Serial Flashing
 
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
 Flashing using only a USB to serial converter will not work as the unit draws too much current as can be observed by a flashing blue led on the PCA and a lot of serial gibberish. As AC is not connected to Gnd I used the available power supply of the unit and connecting the USB to serial converter to J3 pins Gnd, Tx and Rx.
 
@@ -21,8 +21,8 @@ Press and hold the button while connecting to power.
 > If you have an Arduino you may be able to flash without providing an additional power source. I have successfully flashed using an Arduino Duemilanove with the atmel chip pulled out (basically using it for FTDI and 3.3v power regulation). Rx on Arduino goes to Rx on iFan02, Tx to Tx (no crossover like with FTDI). I did not have to press the button, only to ground TP16 while initiating the flash in Arduino IDE. The Arduino provides enough power to flash, however it will not boot into Tasmota unless you plug in to external power (it boot loops after flashing is complete).
 
 ## Additonal information
-* See issue [#2839](https://github.com/arendst/Sonoff-Tasmota/issues/2839) for user information
+* See issue [#2839](https://github.com/arendst/Tasmota/issues/2839) for user information
-* See issue [#3412](https://github.com/arendst/Sonoff-Tasmota/issues/3412) light on after restore power
+* See issue [#3412](https://github.com/arendst/Tasmota/issues/3412) light on after restore power
 
 Functioning iFan02 in Tasmota WebUI
 

Sonoff-iFan03.md

@@ -1,9 +1,9 @@
-(For information on the iFan02 please see here - [iFan02](https://github.com/arendst/Sonoff-Tasmota/wiki/Sonoff-iFan02))
+(For information on the iFan02 please see here - [iFan02](https://github.com/arendst/Tasmota/wiki/Sonoff-iFan02))
 
 ## Serial Flashing
-Please see the [Hardware Preparation](https://github.com/arendst/Sonoff-Tasmota/wiki/Hardware-Preparation) page for general instructions.
+Please see the [Hardware Preparation](https://github.com/arendst/Tasmota/wiki/Hardware-Preparation) page for general instructions.
 
-Next, please see the [Flashing](https://github.com/arendst/Sonoff-Tasmota/wiki/Flashing) page for general information on the flashing process.
+Next, please see the [Flashing](https://github.com/arendst/Tasmota/wiki/Flashing) page for general information on the flashing process.
 
 Flash the latest version of [`sonoff.bin`](http://thehackbox.org/tasmota/json/sonoff.bin):
 

Supernight-dual-wifi-plug.md

@@ -17,7 +17,7 @@ There are 2 circuit boards.  One with the Wifi and esp module and another with t
 
 ***
 
-Found this on the [issues tracker](https://github.com/arendst/Sonoff-Tasmota/issues/5185#issuecomment-462120415)
+Found this on the [issues tracker](https://github.com/arendst/Tasmota/issues/5185#issuecomment-462120415)
 
 Just a quick update. I've still not figured out the second button, but I do have energy monitoring working now.
 

Supported-sensors.md

@@ -34,7 +34,7 @@
 - **MLX90614**  MLX IR Temperature sensor (I<sup>2</sup>C)
 - [**MPR121**](MPR121) Proximity Capacitive Touch Sensor Controller (I<sup>2</sup>C)
 - **MPU6050**  3-Axis Gyroscope and 3-Axis Accelerometer sensor (I<sup>2</sup>C)
-- [**P1 Energy Meter**](https://github.com/arendst/Sonoff-Tasmota/wiki/Wemos-D1-Mini-and-P1-Energy-Meter)
+- [**P1 Energy Meter**](https://github.com/arendst/Tasmota/wiki/Wemos-D1-Mini-and-P1-Energy-Meter)
 - [**PAJ7620**](PAJ7620) Gesture & Proximity Detection Sensor
 - [**PCA9685**](PCA9685) 16-channel, 12-bit PWM LED controller (I<sup>2</sup>C)
 - **PCF8574** 8-port I\/O Expander (I<sup>2</sup>C)
@@ -68,13 +68,13 @@
 
 ## Expanding your devices
 *(written originally for D1 mini but the majority of the information applies to other peripherals)*  
-- [Sensor Configuration](https://github.com/arendst/Sonoff-Tasmota/wiki/Sensor-Configuration)
+- [Sensor Configuration](https://github.com/arendst/Tasmota/wiki/Sensor-Configuration)
 - [Wiring additional things to a module](Expanding-Tasmota)<img src="https://user-images.githubusercontent.com/5904370/53279684-f8864980-3712-11e9-9451-da6259bae2ea.png" width="250" align="right" />
   - [Connecting a Switch](Expanding-Tasmota#connect-switch)
   - [LEGO nightstand switch using Sonoff SV](https://jeff.noxon.cc/2018/11/21/lego-nightstand-light-switch/)
   - [Add a physical button to Sonoff Basic](https://translate.google.com/translate?hl=en&sl=auto&tl=en&u=https%3A%2F%2Fwww.domo-blog.fr%2Fajouter-un-bouton-physique-au-sonoff-basic%2F)
 - [Push Button Wiring and Control](Control-a-Sonoff-using-a-remote-button)
-- [Expand Sonoff S20 with a jack plug](https://github.com/arendst/Sonoff-Tasmota/issues/670)
+- [Expand Sonoff S20 with a jack plug](https://github.com/arendst/Tasmota/issues/670)
 - [Expand Sonoff 4CH with a jack plug](Expanding-4CH)
 - [Modify KaKu to WKaKu Power Socket](Modify-KaKu-to-WKaKu-Power-Socket)
 - [Defining new module types](Adding-new-Module-types)

TYWE3S.md

@@ -8,9 +8,9 @@ GND - GND
  
 ### Additional Information
 
-More information can be found here: [#1190](https://github.com/arendst/Sonoff-Tasmota/issues/1190). 
+More information can be found here: [#1190](https://github.com/arendst/Tasmota/issues/1190). 
 
-For Switches and dimmers with additional MCU check guide [here](https://github.com/arendst/Sonoff-Tasmota/wiki/Tuya-Dimmer-and-Tuya-Switches-(based-on-serial-MCU)) 
+For Switches and dimmers with additional MCU check guide [here](https://github.com/arendst/Tasmota/wiki/Tuya-Dimmer-and-Tuya-Switches-(based-on-serial-MCU)) 
      
 ### Device Images
 ![1](https://user-images.githubusercontent.com/14855001/34748935-615ded3e-f59f-11e7-9f40-320c0a8e14df.jpg)  

TasmoAdmin.md

@@ -1,4 +1,4 @@
-TasmoAdmin is an administrative Website for Devices flashed with [Sonoff-Tasmota](https://github.com/arendst/Sonoff-Tasmota).   
+TasmoAdmin is an administrative Website for Devices flashed with [Tasmota](https://github.com/arendst/Tasmota).   
 You can find it here: [TasmoAdmin GitHub](https://github.com/reloxx13/TasmoAdmin).
 It supports running on Windows, Linux and as Docker container.
 

Tasmota-IR.md

@@ -16,7 +16,7 @@ Send an IR remote control code as a decimal or hexadecimal string in a JSON payl
 Command|Parameters
 :---|:---
 IRsend`<x>`<a id="IRsend"></a>|`<x>` [_optional_] = number of times the IR message is sent. If not specified or `0..1`, the message is sent only once (i.e., not repeated) _(default)_<BR>`>1` = emulate a long-press on the remote control, sending the message `<x>` times, or sending a repeat message for specific protocols (like NEC)<BR><BR>`{"Protocol":"<value>","Bits":<value>,"Data":<value>,"DataLSB":<value>,"Repeat":<value>}`<BR><BR>`"Protocol"` or `"Vendor"` (select one of the following): <BR>`RC5, RC6, NEC, SONY, PANASONIC, JVC, SAMSUNG, WHYNTER, AIWA_RC_T501, LG, MITSUBISHI, DISH, SHARP, DENON, SHERWOOD, RCMM, SANYO_LC7461, RC5X, NEC (non-strict), NIKAI, MAGIQUEST, LASERTAG, CARRIER_AC, MITSUBISHI2, HITACHI_AC1, HITACHI_AC2, GICABLE, LUTRON, PIONEER, LG2, SAMSUNG36, LEGOPF, INAX, DAIKIN152`<BR><BR>`"Bits":1..64` = required number of data bits<BR>&nbsp;&nbsp;&nbsp;&nbsp;for PANASONIC protocol this parameter is the the address, not the number of bits<BR><BR>`"Data":0x1..0xFFFFFFFFFFFFFFFF` = data frame as 64 bit hexadecimal.<BR>&nbsp;&nbsp;&nbsp;&nbsp;e.g., `IRsend {"Protocol":"NEC","Bits":32,"Data":0x8166817E}`<BR>**Or**<BR>`"DataLSB":0x1..0xFFFFFFFFFFFFFFFF` = data frame as 64 bit hexadecimal with LSB (each byte with bits reversed).<BR>&nbsp;&nbsp;&nbsp;&nbsp;e.g., `IRsend {"Protocol":"NEC","Bits":32,"Data":0x8166817E}`<BR>`DataLSB` comes handy with LSB-first (Least Significant Bit First) protocols like NEC, and makes decoding/encoding easier.<BR><BR>`"Repeat":0..<x>` if `0` send the frame once, if `>0` simulates a long press; Note: `"Repeat":1` sends the message twice.<BR><BR>Alternatively, you can send IR remote control codes using [RAW command encoding](IRSend-RAW-Encoding).
-|See also|[`SetOption29`](#SetOption29)  - Set IR received data format<BR>[`SetOption38`](#SetOption38)  - Set IR received protocol sensitivity<BR>[`SetOption58`](#SetOption58) - [IR Raw data in JSON payload](https://github.com/arendst/Sonoff-Tasmota/issues/2116#issuecomment-440716483)
+|See also|[`SetOption29`](#SetOption29)  - Set IR received data format<BR>[`SetOption38`](#SetOption38)  - Set IR received protocol sensitivity<BR>[`SetOption58`](#SetOption58) - [IR Raw data in JSON payload](https://github.com/arendst/Tasmota/issues/2116#issuecomment-440716483)
 
 ## Sending IRHVAC Commands
 

Teckin-sp10.md

@@ -8,7 +8,7 @@ I found the esp8266 as expected in here I was able to identify the module at a e
 [spec sheet](https://fccid.io/2AKBPESP8266-S3/User-Manual/User-Manual-3594791.html)
 
 @znanev did most of the work already 
-[the uk version of this plug as noted by Znanev](https://github.com/arendst/Sonoff-Tasmota/wiki/Hyleton-313-Smart-Plug)
+[the uk version of this plug as noted by Znanev](https://github.com/arendst/Tasmota/wiki/Hyleton-313-Smart-Plug)
 
 it took a great deal of time to confirm that I did indeed have the same pin outs as this UK plug
 I stumbled apon what I think is the original manufacturer of these but we will probably never know 
@@ -45,13 +45,13 @@ For programming you need to solder 4 jumper wires to pins *11*, *12*, *13* and *
 
 ## Configuration
 
-Once *Sonoff-Tasmota*'s WebUI configuration interface is loaded in the browser, you can change many settings using the menu options. Console window is where you can change almost all configuration parameters.
+Once *Tasmota*'s WebUI configuration interface is loaded in the browser, you can change many settings using the menu options. Console window is where you can change almost all configuration parameters.
 
 Head straight to the *Configure Module* menu, selected *'Generic'* for *'Module type'*. Here are the settings that I selected on that screen:
 
 ![tasmota-generic-configuration](https://znanev.github.io/images/hyleton-313/tasmota-generic-configuration.jpg "Tasmota Generic configuration")
 
-*Sonoff* devices usually have a bi-colour LED, but just one of the colours can be controlled directly. The other colour is usually tied together with the relay, so it cannot be controlled independently. I think that is the reason why the *Sonoff-Tasmota* firmware by default controls just *Led1* when a single relay is configured. In the configuration above, only the blue LED will be used (tied to *GPIO2*). But if you prefer the red LED, just change the values for *Led1i* and *Led2i* (select *Led1i* for *GPIO0* and *Led2i* for *GPIO2*).
+*Sonoff* devices usually have a bi-colour LED, but just one of the colours can be controlled directly. The other colour is usually tied together with the relay, so it cannot be controlled independently. I think that is the reason why the *Tasmota* firmware by default controls just *Led1* when a single relay is configured. In the configuration above, only the blue LED will be used (tied to *GPIO2*). But if you prefer the red LED, just change the values for *Led1i* and *Led2i* (select *Led1i* for *GPIO0* and *Led2i* for *GPIO2*).
 
 end quote