Fix naming convention and component list.