Quick refactor on method naming conventions.