Renaming to keep Arduino IDE happy
More renaming to keep IDE happy