Fixed variable and function name collision