Merge "Have class match filename in some maintenance scripts"