Issue #1165286 by naught101: Changed Label->Name everywhere, fixes machine_name. Also fix some coding inconsistencies.