some name changes, added locker destruction