Small code fixes

Rename misspelled class.
Added some finals.
Added a branch to avoid needlessly updating the list.