Clean up company-mode section
Terminology fix