Used Justcode to refactor naming conventions