Rename constructor arguments
Fix invalid arguments value issue