Fix what would have been an undefined local variable or method error
Rename class for clarity
Stop shadowing local variable