Cleaned up parameter names to address mismatch with documentation