Fix method naming / Make super method final