Fixed naming conventions of parameters