Changed more names from generic to specific.
Changed rest of names with dashes to upper-case/cammel-back.
Changed some of names with dashes to upper-case/cammel-back.
Changed some of names with dashes to upper-case/cammel-back.