Fixed the issues with parameter namings