Bugfixes with name change in lightweight script