Correct naming convention for some parameters
8 files changed