Follow naming convention + fix typo

Follow naming convention + fix typo