madrun.lua - some renaming - clean-up coming