Tools - add some charging logic (e.g. laser)
Rename some tables at geeksareforlife's request