Fixed up help output and consistency in naming