SOAP-2335 Renamed misspelled methods and removed unnecessary finals