Changed the lock request list for a set
Renamed classes and cleaned up unused imports